tree 194576dea44fa1489e187e0c681401f96cad8a2d
parent 53b8ca4b7215389488862010751b956729e92733
parent 51697d2781501c30d8db6d2a8e6c2becebcffad8
author Elliott Hughes <enh@google.com> 1428702075 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428702075 +0000

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

* commit '51697d2781501c30d8db6d2a8e6c2becebcffad8':
  Switch minadb over to C++.