Merge gerrit/vulkan-cts-1.0.2-extensions into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:18:36 +0000 (12:18 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:18:36 +0000 (12:18 -0800)
Change-Id: I85d5b331d324d7ef4c8127fea1394801aa207bbf

1  2 
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/mustpass/1.0.2/vk-default.txt

Simple merge