summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorYan Yan <evitayan@google.com>2021-03-02 21:29:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-02 21:29:39 +0000
commit2b5329cf52154a2c71b8c0f2b8db21aab03bcbee (patch)
treee08696fab95228a50104b5497df5a9b45fcd74d8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbf44fe48e6b41065e85e9e7fd5a7d2affac02176 (diff)
parentd57ace3aa462f9422acd59ff40b8e92490e056bb (diff)
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa35 am: d57ace3aa4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8ab124e454f007c0330de636bc9e8b2729fcf4dd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions