tree 7a39e4f797c76bf73f6fdd06a1292a5a1e2a3c11
parent 0420dcba49ee0ea5979c631b7728bab1e6bf907c
parent ea874f8fb70e98f5595ab2d582c31e9d79f300f7
author Elliott Hughes <enh@google.com> 1430529157 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430529157 +0000

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

* commit 'ea874f8fb70e98f5595ab2d582c31e9d79f300f7':
  Fix minadb_test build breakage.