tree e121a86fe799b6f6b96932cc6f76bdd81009f681
parent 75ae70cb7cd8a10be7692c2fb770137278e95a31
parent 41e4f5ae1ce47b475881ffded632d07e91f1ce19
author Elliott Hughes <enh@google.com> 1430529157 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430529157 +0000

am 41e4f5ae: am c0537d68: am 6bc2d538: Merge "Move minadb over to new API."

* commit '41e4f5ae1ce47b475881ffded632d07e91f1ce19':
  Move minadb over to new API.