diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-03-31 21:20:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-31 21:20:51 +0000 |
| commit | d684ebd3a62cb026048d9eebacddb0f824113a5e (patch) | |
| tree | d7a1837116f23279e237f551cec2166904e191ac /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 28c51bacbde1a2a497e20fa4f299fa653eaac9a3 (diff) | |
| parent | 0bd10c21ff1bb00f178738301ad4663c7cebd28f (diff) | |
am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."
* commit '0bd10c21ff1bb00f178738301ad4663c7cebd28f':
Add unauthenticated AES ciphers backed by AndroidKeyStore.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions