| commit | 0d0110ffc0f6caf925e1a5d700fe5756da907cc1 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Mar 20 20:56:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 20:56:03 2015 +0000 |
| tree | 10d2fae2245e3aef8136513f8b6f4e12cd8664d6 | |
| parent | fc14d612c4a89019dabe3a27ef6c2785dd3c1ab4 [diff] | |
| parent | 78c75ec5070aeaab2940136a488dfca71477f78f [diff] |
am 78c75ec5: am a6247469: Merge "keystore: allow system to clear keys even while encrypted" into lmp-dev * commit '78c75ec5070aeaab2940136a488dfca71477f78f':