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