summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-07 18:48:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-07 18:48:02 +0000
commitae6be438cb076e27b4230fb234e5896ce9c7adf8 (patch)
tree2b56415eea2ed28f1df66f68a91dd857f1830f77 /tools/aapt2/java/JavaClassGenerator.cpp
parentf4f5a56fa59335f1c8e450234aba06d4871f964f (diff)
parent30a3473a6187b6c3a8b4df241f6c702b5aecea33 (diff)
Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 1ef739b3fa" into stage-aosp-master am: 30a3473a61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie22d1281939b2191304ecf3c9c8de54913f6aafe
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions