summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-23 16:07:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-23 16:07:12 +0000
commitfa764c3fa3959ca94766b0a7ed406aab410f772a (patch)
treef18b4f23760535840cf3c0410eb17d186883dd01 /tools/aapt2/java/JavaClassGenerator.cpp
parentd5f71b7f7dd8491cd519c0a309f56189ce82b273 (diff)
parent8bca50f4c09602c6cac31a1ea939b874cfe5428c (diff)
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3 -s ours am: a882b8c150 -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions