Merge "CTS v2 integration for deqp"
authorKalle Raita <kraita@google.com>
Thu, 29 Oct 2015 22:48:57 +0000 (22:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Oct 2015 22:48:57 +0000 (22:48 +0000)

Trivial merge