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-19 05:52:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-19 05:52:04 +0000
commit0cfbde601151edec47b4c78f16ff0348d2aa76d6 (patch)
treefd5212ce314d91f45f8ffd5305800846e871e936 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdc1ba6bd14829feaf843f49742ed81c7d6209b98 (diff)
parent0a4c34f52f724c8f0d79127ef27b27b430e491a3 (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8150894a31 -s ours am: 9caa07c236 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions