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)
commit9692d0318a423f57a9c200190ac68fb3e36faba6
tree75b5b7087f8195da303159448545662ed4135bfb
parent0bc4c69e40d7f8e27de765735594c37a85b0e4d4
parent4514355a0fdf809a70393642a377ea0906bc8ae6
Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev

Change-Id: I74387a3ed98feb4162b3d49a411cb220d0f050e9
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/mustpass/1.0.2/vk-default.txt