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-07-11 19:34:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-11 19:34:06 +0000
commit6a9ab1bd5aa5d6dcf57061029d779eed5190cfa7 (patch)
treea68de92a7b6d998dfbb74d1f0b1ef1ead0d8f878 /tools/aapt2/java/JavaClassGenerator_test.cpp
parente049888bc40c31d52eb5054677017b2a51d80e9b (diff)
parentbb9876cc0836e4b964f0ff7c68cefb1a556238ce (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7a33282392 -s ours am: 482997c563 -s ours am: 794dee40c1 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions