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

Change-Id: If80c9b0bca60d9daa96f7e206847b89b0392f4d0


Trivial merge