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-06 14:31:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-06 14:31:51 +0000
commit02ad08515d45e194c11a9fadc50649465ef373ec (patch)
treeb3963b616eb3781c5f8bd4f1cfced083132a3f44 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent54cea41ef50254622cd4044160305c78fb74bfcd (diff)
parenta8e12a9da1d3784e1b2852229e7ebb951fe03864 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 570c6a4e40 -s ours am: 70018d6989 -s ours am: 2552d9dfdc -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions