| commit | 3f3642988dca9761241085088dd316473ea9b0a2 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Mar 26 21:19:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:19:52 2015 +0000 |
| tree | 4299c987e6cff9880ea5e2bd572a7c7c29286f23 | |
| parent | bcc714f6d331e7ea22ed0487c103b70e87b9d3fc [diff] | |
| parent | c9851e2b166074cae1b98dda11398295f717ad5f [diff] |
am c9851e2b: am afe554a3: am cf5a7fc9: Merge "keystore: fully reset user keystore on request" * commit 'c9851e2b166074cae1b98dda11398295f717ad5f':