Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 7 Dec 2018 12:42:23 +0000 (13:42 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 7 Dec 2018 12:42:23 +0000 (13:42 +0100)
commit94ce227fbce90ed84bffba740bfbaf4d8a7369bb
treec9a57633f70797c44a181563a66c2779792f6e5e
parentad0797e0a1ddf28a0a53ad5143a277eaae629bcd
parent12aa347f43c85df3a0daf930739551d3f53d3d48
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I6b9a7542624d1899ed00f694e7f87c1a40252280
AndroidGen.mk
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp