| commit | 92c9692ed50a58dce6b2a4e1bc8728470234aaac | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Mar 31 23:01:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 31 23:01:15 2015 +0000 |
| tree | 779f992e09703b2a2a2fe428d5b7013b3574ed57 | |
| parent | 34702d2e7ea695ee2a05095307c517fa67839a8b [diff] | |
| parent | d684ebd3a62cb026048d9eebacddb0f824113a5e [diff] |
am d684ebd3: am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore." * commit 'd684ebd3a62cb026048d9eebacddb0f824113a5e': Add unauthenticated AES ciphers backed by AndroidKeyStore.