| commit | 52640788597d891173c954f2f5e5c241f5683b28 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Mar 26 22:38:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 22:38:14 2015 +0000 |
| tree | 694cfb89258d1da48c68092ae1c65d0052646fe4 | |
| parent | bb219bcfcc868cd2a52483e32a5c33412ede83d3 [diff] | |
| parent | bcc714f6d331e7ea22ed0487c103b70e87b9d3fc [diff] |
am bcc714f6: am f36b140f: am 4eaae5cc: am d5d811e4: Merge "keystore: allow system to clear keys even while encrypted" * commit 'bcc714f6d331e7ea22ed0487c103b70e87b9d3fc':