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

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