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)
commit2fcee0efebf2ec18c808a38b722eb571b21917a2
treea673c8a9aa41e0d52ed3b009c34b07c2374252dc
parente1d743e8742b4a295fe49bca7f57730f612dad86
parent280d2246e29acec5ea2147be8f9652c26bbdb05a
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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