tree 7a39e4f797c76bf73f6fdd06a1292a5a1e2a3c11
parent 34d3a3d074e977cace29797c428795e1de5b3223
parent 30cea3dcaf1dcf4be9954178f67b4f8dff0fb9f9
author Elliott Hughes <enh@google.com> 1430527155 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430527155 +0000

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

* commit '30cea3dcaf1dcf4be9954178f67b4f8dff0fb9f9':
  Fix minadb_test build breakage.