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-27 00:00:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-27 00:00:23 +0000
commita9ea1f2f65585eb5097a975b2532ec5179a7c14f (patch)
tree02e9962c13ac600ddc831d7e9e7c6be68c4f6299 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1c7370cf31b4258d97108e21b133ffd3bb7a8692 (diff)
parentc8d838c5f7b74abc6694d1ef2823aea6491e7409 (diff)
Merge "Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours am: 3c1c07a9fe -s ours" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions