tree 640b84aa246113f127908d0c6f65cffbc28f7700
parent 056ef407473a82ee688a3520bca4622feb5a5b8b
parent ad4661a0be6b627735116d26a32033c959852c40
author Chad Brubaker <cbrubaker@google.com> 1425750762 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425750762 +0000

am ad4661a0: Merge "Add Keymaster 1.0 binder methods"

* commit 'ad4661a0be6b627735116d26a32033c959852c40':
  Add Keymaster 1.0 binder methods