commit | 41ceb7dbdc66739488f78655af958ba13278fc70 | [log] [tgz] |
---|---|---|
author | Chad Brubaker <cbrubaker@google.com> | Sun Mar 08 00:08:35 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Mar 08 00:08:35 2015 +0000 |
tree | 640b84aa246113f127908d0c6f65cffbc28f7700 | |
parent | c451fe041c7c67cb111948c9c615b0cd99830d6a [diff] | |
parent | f1171da9b65d11b0d3f0a7a34bbe5c6485465e20 [diff] |
am f1171da9: am ad4661a0: Merge "Add Keymaster 1.0 binder methods" * commit 'f1171da9b65d11b0d3f0a7a34bbe5c6485465e20': Add Keymaster 1.0 binder methods