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