diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-11-25 15:48:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-25 15:48:16 +0000 |
| commit | cccd5ae1786bc3246acdd6981a30073021a1d0e8 (patch) | |
| tree | 79d4f6cd5e1880ce561af926d8ecff81130a0452 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f22f42cb03c11c4391d620efab75fcb2e1338619 (diff) | |
| parent | 846481d38ca5273ddd22e4889a6ff0b145f71fad (diff) | |
Merge changes from topic "am-889d5ea693c047c5be9c863bba2ec84e"
* changes:
Merge "Add IKE to allowable zygote paths" am: 99e1e2812f am: 28ee420e5c am: 5e4beca11c
Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig" am: 091e420529 am: bf9172deb4 am: d8dbd83e6d
Expose IKE module API: Session Options & EapSessionConfig am: 39202c84a1 am: 1230075676 am: 85cd7d9bc8
Expose IKE module API: IkeException, configuration & callback am: c4a5883fc5 am: 4e19cf4738 am: 68a828daca
Expose IKE module API: IKE ID, TS and SaProposal am: 69d77da91a am: 327e0fcecc am: 171bf87879
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions