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