Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 8 May 2019 07:44:38 +0000 (09:44 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Wed, 8 May 2019 07:44:38 +0000 (09:44 +0200)
commitfad6405834b6e0fd92746d4daf2bcbf78ffc29ec
treee9421d9fa6f1278a12d2a6a0ab577def035501fb
parenta4e6ff19885a8f2c7553cb4016a489819f379719
parentb2193dabefd4e1b0b6717a01d4e44106d6a2e277
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ib7804c50998bf46dfed19ef8e75fe42d3ce21d26
android/cts/master/vk-master.txt
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt