| commit | 0d6d32920134aa84e55fab59b6bd3a71c7bcb38f | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu May 08 08:55:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 08 08:55:34 2014 +0000 |
| tree | a946968305f48216618f8e0c7332f64ee0709465 | |
| parent | 578741db192290a996a4a4f1fe6d7c28b64181c3 [diff] | |
| parent | 6005b896b58659f8c2e0693bd9ead32706a05044 [diff] |
am 6005b896: am 4abcf7ad: Merge changes Iaaafcbed,Ifbca5637 * commit '6005b896b58659f8c2e0693bd9ead32706a05044': KeyStoreTest: add more key types KeyManagerFactoryTest: add all the possible key types