summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-26 08:30:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-26 08:30:34 +0000
commitfc682241c199d450014726e7b10b0379cc915795 (patch)
tree2268ab4e8b606824b5b19b7835a46d5759b9689a /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfb12c3ed91702e07ddfc338ad62b33fe3765135c (diff)
parent1f1af8a5e0d1233f3b211b17b8301565e27a9751 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours am: 101cf38a40 -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions