| commit | 2ca97bcd70bd55a5bf75f1ed8e836bdc876c8c9d | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Mon Mar 16 22:07:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 16 22:07:37 2015 +0000 |
| tree | 73a635740a5db944bd6cecb020f386c328a1eb77 | |
| parent | 48c45fec70722c0afd9af7e98b868bd0aa952ec8 [diff] | |
| parent | af3e993d459791f77feb66756bc2ac21d46a052a [diff] |
am af3e993d: Merge "Implement keymaster 1.0 get_key_characteristics method" * commit 'af3e993d459791f77feb66756bc2ac21d46a052a': Implement keymaster 1.0 get_key_characteristics method