Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 26 Jul 2018 13:28:06 +0000 (15:28 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 26 Jul 2018 13:28:06 +0000 (15:28 +0200)
commit7131892d2ad7e4efb56a134fe160298a42a77f41
treea2524d71777a8c68987f80b8d513cee766e4d079
parent3681f22c174353b764922a565a17d23e23e9c04b
parente8cc637f8778fef7e3e47ca3e172ea8c89bd1751
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I837ad0e47212620530fb951cf47306c60507fd05
AndroidGen.mk
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