tree 50a26b997958b2db8d64ade8618d72b30a148992
parent c2b60b9870955c14ec8434353d617ebca6f44368
parent 2d1022250941873f8748e6a159d4e5bf976e511f
author Dan Albert <danalbert@google.com> 1424390730 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424390730 +0000

am 2d102225: Merge "Kill of most of the remainder of minadbd."

* commit '2d1022250941873f8748e6a159d4e5bf976e511f':
  Kill of most of the remainder of minadbd.