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:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-06 14:31:24 +0000
commit06aa194507e926e18c4a69f90aa2f84857f378a8 (patch)
treeb3963b616eb3781c5f8bd4f1cfced083132a3f44 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0355f592f706c88d808673cab759d13f374e538c (diff)
parent1bd88ae76329589149f365ed321cbfa7b241e7b6 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c4c8e17c99 -s ours am: 17e5b6543e -s ours am: 3a1f81ed45 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions