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-21 08:55:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-21 08:55:23 +0000
commita795247dc4c3e6335b2f8b7a1d6ca6e2cc37dbd1 (patch)
tree58fbabf65039e97889bc8fb11492019a3e8a696f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc1a9dcb16819c25e1cbe4d30894a4b02de78ba5a (diff)
parentcf73418aa758b3c3f69039473de30e483785bbf8 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8db9af6fb5 -s ours am: d04121bcfc -s ours am: 78ba842d96 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions