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-24 17:57:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-24 17:57:32 +0000
commitb9d48e037962e3d083a070fd2103a0fdb5acdcf4 (patch)
tree2fbc8abfb8063463f6de93a7bc824838f8c72c2a /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd112ca2a5cc739448a4525564fea7ee2242da44f (diff)
parent397fe00ab016f25edec873f51e6cc2b62fb970d3 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 2063d3cd70 -s ours am: bf3033fdc2 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions