tree fb59803a356d869fd20b2c2135cf0ae9990b4595
parent 4d1b0903ff85769efd50d7bd02775b5861c31fbb
parent fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a
author Colin Cross <ccross@android.com> 1390855596 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390855596 +0000

am fd84f65d: am f3532072: Merge "minadbd: remove dead code"

* commit 'fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a':
  minadbd: remove dead code