| commit | afe554a3c23085376cd27b8824c3fb7ff73f8abe | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Jul 31 23:16:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 31 23:16:15 2014 +0000 |
| tree | c8047628401f1511fde644634a206d5b28ecb73d | |
| parent | 4eaae5cce28a6e06e25427b2e0a5b156bfafeade [diff] | |
| parent | cf5a7fc9fbaa8a084fb874ad2d6780c6914cd278 [diff] |
am cf5a7fc9: Merge "keystore: fully reset user keystore on request" * commit 'cf5a7fc9fbaa8a084fb874ad2d6780c6914cd278': keystore: fully reset user keystore on request