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:30:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 03:30:40 +0000
commitbd112fb44fbf7433567f66ddbce14ec314876370 (patch)
tree3405afe5c11f554f0e70864e5b5c8794f435901a /tools/aapt2/java/JavaClassGenerator.cpp
parent83ee6f1b35086f7fbb181e6a7f101228400688ea (diff)
parent5d2584f6d73bdaae8a762e8af1509a65be334ed7 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5d2584f6d7 -s ours
am skip reason: subject contains skip directive Change-Id: Ibf855ee79f06e4c1cc91e8deb61a4b9a7804d5d3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions