| commit | 2131c7c5999c2b32b8eedc888cad194f26442b8b | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Apr 18 21:15:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 18 21:15:30 2014 +0000 |
| tree | e9cd72fd69dbe421469f7d2657a3e7ee7be574d5 | |
| parent | dbcec633d3d9e7e63f287e39c691439424a9c288 [diff] | |
| parent | cb3a62ea2f9a08dbe83ff68685f6361a5d015345 [diff] |
am cb3a62ea: Merge "keymaster: add flags indicating feature support" * commit 'cb3a62ea2f9a08dbe83ff68685f6361a5d015345': keymaster: add flags indicating feature support