summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-19 00:02:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-19 00:02:33 +0000
commit51312449ccee6712e34c1a84ae3f11a1633442df (patch)
tree1d2f1d4858e6fedf96a6af91a5f42bf5f1664df4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbd9ab1a4d2eb30f46399442b4324cc369f825261 (diff)
parent94e7f94c926e63bb31958afdc0e88a8aef66696d (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e7f3897b6a -s ours am: effc2bdd8c -s ours am: f241a62445 -s ours am: 3dd3966e73 -s ours am: 94e7f94c92 -s ours
am skip reason: subject contains skip directive Change-Id: I129da5d24c589cd07b6414c1a75cb3531d8b9a91
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions