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 23:37:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-26 23:37:19 +0000
commit5c7bf3574e7a770f8b580e8df6b3c66c15f41c0c (patch)
tree02e9962c13ac600ddc831d7e9e7c6be68c4f6299 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb52a575764bd37bd338438bfe7bd3431062efcb7 (diff)
parent92f1b8183dbcdb83af189c57bfccb7898526525f (diff)
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours am: 611a6ffe29 -s ours" into oc-dr1-dev am: 527cd8b04d -s ours" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions