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-23 18:29:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-23 18:29:34 +0000
commit14712d06a2f9eccddeef7155507f6edfe87996cc (patch)
tree5c9a79eccf75bf4114202965af78e891dd5f0b00 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf164789d8ffa4bf81eafeb201c28f833c4a16ac6 (diff)
parent837d97d17c7359a7647ca48e6d5845bdaa40614d (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dffcd5fe7a -s ours am: be8cba0fac -s ours am: bb15668b5f -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions