summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 03:51:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 03:51:56 +0000
commit9558ea30108e1528e79d2a21cd197c0ac0f96478 (patch)
treeb8c6192c6fe566edb84d8b77c666b3ad98e006df /tools/aapt2/java/JavaClassGenerator.cpp
parente004a37a7da97a0085206d19f52cba97eaaa811d (diff)
parent2e99ad6290a60ec692c3fcbc29e9b20ca41d542d (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 1e036749ba -s ours am: e93ad6e0ea -s ours am: 2e99ad6290 -s ours
am skip reason: subject contains skip directive Change-Id: I6d8619723b1ae15ddb87167b10eeb5e5b741aaec
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions