| commit | f36b140f90c40095f6755ac305493646b587a999 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Mar 20 20:56:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 20:56:01 2015 +0000 |
| tree | 10d2fae2245e3aef8136513f8b6f4e12cd8664d6 | |
| parent | 9976480a6e7fc53b40f0fe97aac29aa297bfd1b7 [diff] | |
| parent | 4eaae5cce28a6e06e25427b2e0a5b156bfafeade [diff] |
am 4eaae5cc: am d5d811e4: Merge "keystore: allow system to clear keys even while encrypted" * commit '4eaae5cce28a6e06e25427b2e0a5b156bfafeade': keystore: allow system to clear keys even while encrypted