| commit | bd3c916d4bccc5fd996a2c5f4cbae7dbf900cf08 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Mar 26 22:38:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 22:38:15 2015 +0000 |
| tree | 694cfb89258d1da48c68092ae1c65d0052646fe4 | |
| parent | 52640788597d891173c954f2f5e5c241f5683b28 [diff] | |
| parent | 3f3642988dca9761241085088dd316473ea9b0a2 [diff] |
am 3f364298: am c9851e2b: am afe554a3: am cf5a7fc9: Merge "keystore: fully reset user keystore on request" * commit '3f3642988dca9761241085088dd316473ea9b0a2':