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-06 14:34:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-06 14:34:37 +0000
commit3f704383a4c32bb14326ac4123fb7617e270e743 (patch)
tree14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3b5340b3616bb937f10c12283e5a8553151a4e24 (diff)
parent64676c7ec8ece6fd3c286c64048a02b91914d3b6 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: c299f6aff2 -s ours am: 545affd91c -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions