| commit | c9851e2b166074cae1b98dda11398295f717ad5f | [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 | f36b140f90c40095f6755ac305493646b587a999 [diff] | |
| parent | afe554a3c23085376cd27b8824c3fb7ff73f8abe [diff] |
am afe554a3: am cf5a7fc9: Merge "keystore: fully reset user keystore on request" * commit 'afe554a3c23085376cd27b8824c3fb7ff73f8abe': keystore: fully reset user keystore on request