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-03-17 15:12:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-17 15:12:00 +0000
commit8b742599e7b58cc965db84c6ea7ade3280859a32 (patch)
tree3391de29411bdb45c6d892daa5b9d796afc598d6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent12642393823a9efdb51363cb11c41219212e95ed (diff)
parentcf334e2c93556a2f936a3cebb7be52df9186f16d (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cf334e2c93 -s ours
am skip reason: subject contains skip directive Change-Id: I931d14b2a813ac5abc3bf9304d9154a8b564f7bc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions