commit | a62474699a202588609d7051e677f23734151900 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Thu Jul 31 23:09:44 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 31 19:45:19 2014 +0000 |
tree | c8047628401f1511fde644634a206d5b28ecb73d | |
parent | 931fac098f2ae35aa1da26ced57962c9a21f95cf [diff] | |
parent | 007cb236ada4b3d70815f03dd07116a5e187f4dd [diff] |
Merge "keystore: allow system to clear keys even while encrypted" into lmp-dev