diff options
| author | Yan Yan <evitayan@google.com> | 2021-03-02 21:35:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-02 21:35:55 +0000 |
| commit | b461146ffb60cc2d55c2235369d3b91e5ca13a08 (patch) | |
| tree | 4d6109ef2c454e43a73d933d5f42697d0cf85ea5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9ac36e42456f7b5e00a82597bbd842b906e39b16 (diff) | |
| parent | 2b5329cf52154a2c71b8c0f2b8db21aab03bcbee (diff) | |
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa35 am: d57ace3aa4 am: 2b5329cf52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2477f98c4aeaa6059944a204cc14db5b6fb5fc63
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions