| commit | 97245c3ba9db7b9355425f9226b72b26f3ddf7eb | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Feb 06 18:16:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 06 18:16:23 2014 +0000 |
| tree | 7a9b12af79ac9655a98a3941532efe3249e20705 | |
| parent | 2741e64d5e71a37a5893733c214911b094a1967d [diff] | |
| parent | 53a15bbd74d5348d74befcc57f778b94380b022d [diff] |
am 53a15bbd: am b00af8f1: Merge "AndroidKeyStore: enforce keys have no encoding" * commit '53a15bbd74d5348d74befcc57f778b94380b022d': AndroidKeyStore: enforce keys have no encoding