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-09 22:46:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-09 22:46:52 +0000
commitdb4be448a4da46a5ef190c8aa3932ea6b186ae69 (patch)
tree565890be40d2e76961a9badc89fbd7b69252dee8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentebd055c06a1cae09918056deb2534614a70090fd (diff)
parent20c5be14509cbca793a0500449ff55691502780f (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f670a4a50b -s ours am: fcb4b21373 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions