summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndrei-Valentin Onea <andreionea@google.com>2021-01-07 17:35:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-07 17:35:17 +0000
commitdd1d1cbacc5d8f6694af2b54bd1bbcdce01f77ef (patch)
tree6febe503a9d4780249b2585fa895bc4f79273b6a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent73e293134dcdc93849bf9657f4d06f0c22c4e804 (diff)
parentd1ebbf508682442fa8f3b0440e6c1891eb818bc1 (diff)
Merge changes from topic "preinstall-overrides" am: 29ed176b46 am: d1ebbf5086
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520701 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I94c9aca60ff8d5eec190434a2a22338cb04d5922
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions