Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 25 Aug 2017 14:19:26 +0000 (16:19 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 25 Aug 2017 14:19:26 +0000 (16:19 +0200)
Change-Id: Id2e9909ac0e558d2b4ba45e2e273ab6ed8c0d152

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

Simple merge