Merge upstream-vulkan-cts-1.0-dev into master
authorPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 20:02:10 +0000 (13:02 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 20:03:01 +0000 (13:03 -0700)
Change-Id: I318218fecd46ac39cc8dd5904d6fae3658bdb771

1  2 
android/cts/master/com.drawelements.deqp.vk.xml
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkNullDriver.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp

Simple merge