summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-19 19:37:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-19 19:37:09 +0000
commit78c13045f07d221f22c56710ebd72b85c0be6841 (patch)
tree274d4692a038259d849da4d86f1ede1a4a8b0916 /tools/aapt2/java/JavaClassGenerator.cpp
parent970cab2592ec00083e764d4ec111e6618c38364d (diff)
parentf98a1294496bfc96d2ba08480a681af997216b6a (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: b15b8399e4 -s ours am: fdb56d01b5 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions