summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-14 20:51:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-14 20:51:58 +0000
commit7ee42eb90000e451fc2e281af9b058fa7048d7ce (patch)
tree1e898a52e76cc791888d1cd1a5aeba21a2c44dde /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1d08ee2d8a71f070f8c529f8ac7faba0a0ec59cf (diff)
parentc04a2697872b1bb8add743f74ddc4c825d9fdf2c (diff)
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 9cdfb9d781 -s ours am: 60c459ff05 -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions