Merge "Change deqp APK to cts target instead of cts_v2" into nyc-dev
authorKalle Raita <kraita@google.com>
Wed, 9 Mar 2016 20:02:23 +0000 (20:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 9 Mar 2016 20:02:24 +0000 (20:02 +0000)

Trivial merge