tree e121a86fe799b6f6b96932cc6f76bdd81009f681
parent ea874f8fb70e98f5595ab2d582c31e9d79f300f7
parent c0537d688529bd38e691ead93815ece29ad15b7b
author Elliott Hughes <enh@google.com> 1430528171 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430528171 +0000

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

* commit 'c0537d688529bd38e691ead93815ece29ad15b7b':
  Move minadb over to new API.