Merge "Add DeqpPlatformCapabilityQueryInstrumentation."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 23 Jan 2015 01:07:49 +0000 (01:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Jan 2015 01:07:50 +0000 (01:07 +0000)

Trivial merge