| commit | ed0ce5f2d72dc610f3f1cf90f86c887a2d5efe80 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Mar 26 21:19:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:19:55 2015 +0000 |
| tree | 4299c987e6cff9880ea5e2bd572a7c7c29286f23 | |
| parent | c9e1e4210d8d80ea35ec13a3d810de8f290aacf2 [diff] | |
| parent | 0d0110ffc0f6caf925e1a5d700fe5756da907cc1 [diff] |
am 0d0110ff: am 78c75ec5: am a6247469: Merge "keystore: allow system to clear keys even while encrypted" into lmp-dev * commit '0d0110ffc0f6caf925e1a5d700fe5756da907cc1':