Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 12 Apr 2018 08:51:55 +0000 (10:51 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 12 Apr 2018 08:51:55 +0000 (10:51 +0200)
commite40527f41aaaa7c903b575225ce7312883e72cc3
tree9a0c588d484109373f545f4109ec5443673aacff
parent6e122383013d5ea5019f2a632b70588e40ed1d9b
parent09111007c332d979a331822dca4c07c2dab5e1ad
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I1210a0277ea4dfa9a07734000a16a7d413429ec7
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