tree 194576dea44fa1489e187e0c681401f96cad8a2d
parent 448c4ad353c77c0088228db8de2f27dd15f1631d
parent a90ba39beb8762f5a1f21b03f2734acda4fb03b1
author Elliott Hughes <enh@google.com> 1428703123 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428703123 +0000

am a90ba39b: am 51697d27: Merge "Switch minadb over to C++."

* commit 'a90ba39beb8762f5a1f21b03f2734acda4fb03b1':
  Switch minadb over to C++.