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