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:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-08 13:24:07 +0000
commit73085fc99a74f047016e5586e04cd99c40ff0997 (patch)
tree0ef8fc02ce649946870d40c3165541ad854ae35d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent340eba0dca7116d60783dfd3597a75a5a764b107 (diff)
parent88d5f5eda04444c4de48f924faeeb4d3138bb177 (diff)
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 64d6fddc4b -s ours am: 25ad61262e -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions