summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-10-11 20:33:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-11 20:33:34 +0000
commit9ba5681aecbb06f5f4df9826cb17816aca85f982 (patch)
tree1b6cd75fcf2cfb3481e2913c9a31db66ce9b8233 /tools/aapt2/java/JavaClassGenerator.cpp
parent17b8aa19c7d6e9ff7eb8a54031e15dc9f1e24262 (diff)
parentd394cbacf781586aca42ef86bc37f990ae80313f (diff)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: ae4dc78421 -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions