summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-18 23:43:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 23:43:42 +0000
commitd6e0d72bf16fd8c11fd166e9f4bca9a2d361050c (patch)
treec16715a40d927bd3553ff751f48176cfe0258109 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentaeaabf847a7de1c93eb07a9711a807fbe6356957 (diff)
parent0abcc5ab8e8954afe0b6c3533670c902343a45b0 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65e9e82b3e -s ours am: 784cb61c9b -s ours am: f446c04ffd -s ours am: 0abcc5ab8e -s ours
am skip reason: subject contains skip directive Change-Id: Ib69340d7aa81879a24d696cdb4867419d0e9f9c1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions