tree 7a39e4f797c76bf73f6fdd06a1292a5a1e2a3c11
parent 073e3381a2755c08e9e108640ff576f18cdff118
parent c67e89ada5b8f549e8844e0b722d3310398bf4e8
author Elliott Hughes <enh@google.com> 1430528170 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430528170 +0000

am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage."

* commit 'c67e89ada5b8f549e8844e0b722d3310398bf4e8':
  Fix minadb_test build breakage.