Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 30 Mar 2018 16:39:12 +0000 (18:39 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 30 Mar 2018 16:39:12 +0000 (18:39 +0200)
commit61c4decd5e70e11bb058e0dd702095cade935070
tree4ea795c9763fd67d7dc075f2d4d689e8881c7a61
parent48d1b58988b2c59833429fc8075813341d95e62b
parent00306b354b9c315f9c42b6db1c1ae43d030dd950
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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