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 20:38:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 20:38:22 +0000
commit2dc9a569dfda6ceefafa339370198a9b47091a6b (patch)
tree42fdc28d75d5c5b8e9ced1c683d401192c37e443 /tools/aapt2/java/JavaClassGenerator.cpp
parent88199ac614b8a6a915b828260057a43b7ca116c0 (diff)
parent911eb7a41477ed3fa360408bd6f888fb019fda35 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 911eb7a414 -s ours
am skip reason: subject contains skip directive Change-Id: I8b0110dea49791222efab1e91c8e687033d03323
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions