Merge "Copy collect-tests-only option in DeqpTestRunner" into nyc-mr1-dev
authorAaron Holden <aaronholden@google.com>
Tue, 23 Aug 2016 20:44:21 +0000 (20:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 20:44:21 +0000 (20:44 +0000)
am: b9152fed9f

Change-Id: I7af2707f5b48af288391aa8534a855e38bd758b5


Trivial merge