summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 19:36:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 19:36:00 +0000
commite573293a37113cbfcc4b0bafe7dca530bacdc539 (patch)
tree3a079858e63391522d24443e7a64a73320de608f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfad948f29dd22cd41b5fdbabb9eddada3ac12031 (diff)
parentca40bbe7c7dbc618580d7f198545bb412ba9ec1d (diff)
Merge "[automerger skipped] Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into pi-dev am: 2faaf6f47f -s ours am: 5f8c3f459f -s ours am: 09520b53d4 -s ours am: 16a59786b4 -s ours am: 5f6ea716ec -s ours" into rvc-d1-dev-plus-aosp am: ca40bbe7c7 -s ours
am skip reason: Change-Id I2159c357911ff39ffd819054b42f96ae86bc98bc with SHA-1 d804661712 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11369823 Change-Id: I7d5139ccf665a7ebfd922e9a345f862516ff9574
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions