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-05 06:16:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-05 06:16:17 +0000
commit8f9ddb86e51039ffa09a7ab41d7b7d0c51dba51a (patch)
tree3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3805c9de579f4817764f7f1049148ce9d005c230 (diff)
parent42cce30992ef1c21153e98a0db9c27648912e7e9 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: b43c3c0388 -s ours am: 7b55597e03 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions