Merge "Copy collect-tests-only option in DeqpTestRunner" into nyc-mr1-dev am: b9152fe...
authorAaron Holden <aaronholden@google.com>
Tue, 22 Aug 2017 17:42:45 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:42:45 +0000 (17:42 +0000)
am: d3df95e783

Change-Id: Iab0238a84d7e2084752c92481d32a472775b40ce


Trivial merge