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:05:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-23 16:05:52 +0000
commit71caaa9f9d65e707a74188b0a6db8f05a75112c6 (patch)
treef18b4f23760535840cf3c0410eb17d186883dd01 /tools/aapt2/java/JavaClassGenerator.cpp
parent720c041b1a233e7b5e775056b92144494bd9000c (diff)
parent8c14e3ad910939c0cf36796d86a9729dd132e956 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 1a49e73d2a -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions