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:35:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-06 14:35:07 +0000
commit70769d583bdce0b222ee7a1b09496ab9e1cfee19 (patch)
tree14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7a0fd74a933b5813903ded8be8bb54a749e09b07 (diff)
parent964dc598ca3ca738a4c6ceb32cb42dbc9692c670 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: 4b4922186a -s ours am: c4919e09ff -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions