tree 50a26b997958b2db8d64ade8618d72b30a148992
parent a1df1a778826742eeef11ed449bcffb95e119c80
parent 552fceb85cde45581ef04a23a2e76e6298ed15a5
author Dan Albert <danalbert@google.com> 1424391823 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424391823 +0000

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

* commit '552fceb85cde45581ef04a23a2e76e6298ed15a5':
  Kill of most of the remainder of minadbd.