Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 21 Jul 2017 16:55:51 +0000 (18:55 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 21 Jul 2017 16:55:51 +0000 (18:55 +0200)
Change-Id: Ie8c380f767aa3aeba968a3bbadefc02875f74809

1  2 
android/cts/master/vk-master.txt
external/vulkancts/mustpass/1.0.3/vk-default.txt

Simple merge