| commit | 6005b896b58659f8c2e0693bd9ead32706a05044 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu May 08 06:50:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 08 06:50:42 2014 +0000 |
| tree | 80d9f7c07cb9006c77d3def19fc9be393fe8f5e7 | |
| parent | c0a0523f5f8b99766e79aad97d90bb09b1b78b34 [diff] | |
| parent | 4abcf7ad18a9b96999f5df60b572d355dfdcefe5 [diff] |
am 4abcf7ad: Merge changes Iaaafcbed,Ifbca5637 * commit '4abcf7ad18a9b96999f5df60b572d355dfdcefe5': KeyStoreTest: add more key types KeyManagerFactoryTest: add all the possible key types