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