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:22:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-06 14:22:42 +0000
commitc9bf424804550e0b438ba3fdee096236c8af8c8d (patch)
tree4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4c526e22cf4a933190b111570cb70047e88b8d57 (diff)
parentd4850bb97486374b6de87913c11884a0bd261ac8 (diff)
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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions