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-01 15:06:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-01 15:06:53 +0000
commit1c7e8eaaa683af54177415e9a26a25c81e38b236 (patch)
tree3898517807cc2696cca821a40896680a0513005b /tools/aapt2/java/JavaClassGenerator_test.cpp
parentecce06e6cd1ae449bd688a26aa59706a38acf941 (diff)
parent5cab6e1d2977b3c942a816df6c1b88ad100a5b03 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b5e2901ec0 -s ours am: d29310da5d -s ours am: 7a8a34442a -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions