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:23:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-08 13:23:53 +0000
commit73cadc95998d40790dda93826ed3f69c621b65ad (patch)
tree0ef8fc02ce649946870d40c3165541ad854ae35d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8f2006ac003f225aa309a12c35f855c0812a6737 (diff)
parent982f0d4a3881147c5e47dc5ec83ff5b09001a5ec (diff)
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2d3c74a2fd -s ours am: 74323832de -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions