tree bb61e74fde6d753997ff98519010ce10d58fb7f0
parent 5dc9451177d76bfb42ce334438b98de6736e7591
parent dda456b5da3d59a71b486aa85912dec65b3089b2
author Dan Albert <danalbert@google.com> 1424392246 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424392246 +0000

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

* commit 'dda456b5da3d59a71b486aa85912dec65b3089b2':
  Kill of most of the remainder of minadbd.