| commit | 78c75ec5070aeaab2940136a488dfca71477f78f | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Aug 01 13:50:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 01 13:50:40 2014 +0000 |
| tree | c8047628401f1511fde644634a206d5b28ecb73d | |
| parent | 27c27b708672c125b61e1733be304c9826560151 [diff] | |
| parent | a62474699a202588609d7051e677f23734151900 [diff] |
am a6247469: Merge "keystore: allow system to clear keys even while encrypted" into lmp-dev * commit 'a62474699a202588609d7051e677f23734151900': keystore: allow system to clear keys even while encrypted