commit | 0bd10c21ff1bb00f178738301ad4663c7cebd28f | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Tue Mar 31 21:13:49 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 31 21:13:49 2015 +0000 |
tree | 8ffcfa6e70f14712472f218b77af8cfd34949ae2 | |
parent | a3a52a96543bd3874e23d90f91b5f4197eab98e5 [diff] | |
parent | 5960c3d56614830439718e93968e0c7d2727262f [diff] |
am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore." * commit '5960c3d56614830439718e93968e0c7d2727262f': Add unauthenticated AES ciphers backed by AndroidKeyStore.