| commit | 4eaae5cce28a6e06e25427b2e0a5b156bfafeade | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Jul 31 22:28:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 31 22:28:58 2014 +0000 |
| tree | df84e20bccc755f569c63b3481bc9213f4dd4fd0 | |
| parent | e193741807aa7581dc159fcf2e81b931b4b8af73 [diff] | |
| parent | d5d811e4abab80dc3e1a74708246ec200dbcc335 [diff] |
am d5d811e4: Merge "keystore: allow system to clear keys even while encrypted" * commit 'd5d811e4abab80dc3e1a74708246ec200dbcc335': keystore: allow system to clear keys even while encrypted