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-11 21:08:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 21:08:20 +0000
commitfd90ba695c826b4c2861c3b3e2ec7a07357c5ed7 (patch)
treed907c1f4371ca3613eccd01df13f4e452385282b /tools/aapt2/java/JavaClassGenerator.cpp
parent14cb134570d4431697ed1734184f18cd223d7def (diff)
parente53f6ddd8f61ed19d851af619755a15059dac1fa (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: e53f6ddd8f -s ours
am skip reason: subject contains skip directive Change-Id: I20294970eb9af377071fbd042f6f0e84c1faac16
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions