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 21:28:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-05 21:28:08 +0000
commita06970a74280fb65c84f9d6d626b5ee23f74beb9 (patch)
tree3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta8b2f1448a101a7c03f3b5246e8a7a2f24a4cfe1 (diff)
parent126e571040548328eb5970f74191f291267427c3 (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 4aa476c0eb -s ours am: 4c3e8bbff9 -s ours am: a4da0a546f -s ours am: fe6079e083 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions