Merge "Add tests for varying linking by location" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 21:41:39 +0000 (21:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 13 Jun 2016 21:41:40 +0000 (21:41 +0000)
1  2 
android/cts/master/com.drawelements.deqp.vk.xml
android/cts/master/vk-master.txt

Simple merge