Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 22 May 2019 15:25:35 +0000 (17:25 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Wed, 22 May 2019 15:25:35 +0000 (17:25 +0200)
Change-Id: Ic7109247af908122717c9baa661ba94304652cb2

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

Simple merge