summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-12 01:32:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-12 01:32:19 +0000
commitc6199ca4d883cb1411c251e49e4349355c80a6a8 (patch)
tree3998d4f973f1d3472d8a73e2b1cda58c5b14566d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc0800cfc209f6e71f93095dfe50c7b2342c9a8d4 (diff)
parent805865c3143a5440914046974f1bcbf5d96fc284 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 805865c314 -s ours
am skip reason: subject contains skip directive Change-Id: I01982de063bc8532fe9615ba0a451527aafea132
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions