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:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-06 14:34:45 +0000
commit5db050142d68743c451945314cec810aa10bc893 (patch)
tree14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3f704383a4c32bb14326ac4123fb7617e270e743 (diff)
parent399ac463f3b75d4abe589c2c5f1232b742a41b71 (diff)
Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f192f44d7 -s ours am: b30a1434b9 -s ours am: 4f2fb70652 -s ours" into rvc-d1-dev-plus-aosp am: c9bf424804 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions