| commit | a6ed0b7291dd6121fcaa25d1967c4182276744bc | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Mar 26 22:38:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 22:38:17 2015 +0000 |
| tree | 694cfb89258d1da48c68092ae1c65d0052646fe4 | |
| parent | 3f70b95c1da56e725d18e88296eb1ecac30af1e5 [diff] | |
| parent | ed0ce5f2d72dc610f3f1cf90f86c887a2d5efe80 [diff] |
am ed0ce5f2: am 0d0110ff: am 78c75ec5: am a6247469: Merge "keystore: allow system to clear keys even while encrypted" into lmp-dev * commit 'ed0ce5f2d72dc610f3f1cf90f86c887a2d5efe80':