summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-08 13:24:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-08 13:24:12 +0000
commit85e87bdccb9b03b7ab21c3b52cebb510d666131a (patch)
tree0ef8fc02ce649946870d40c3165541ad854ae35d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent73085fc99a74f047016e5586e04cd99c40ff0997 (diff)
parent9d70a4c5ae162e8f522198e8cb5dba6afad3e7b4 (diff)
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: e573989e05 -s ours am: 064464251f -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions