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-24 21:21:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-24 21:21:14 +0000
commit78ef9eb105ef356c539f4237c77e75c0bb73d855 (patch)
tree73034d87dd16128525138a4b0cb05ea972b6bddb /tools/aapt2/java/JavaClassGenerator_test.cpp
parent099779fe125c77e1223b9f200ee56c35c23cf8a3 (diff)
parentf77990c1fe6a71c6d4ccf67e8780225fba07d7bb (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a7afeea7b6 -s ours am: eae2b4dbfb -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions