Merge vk-gl-cts/master into aosp/deqp-dev
authorPyry Haulos <phaulos@google.com>
Fri, 31 Mar 2017 19:47:37 +0000 (12:47 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 31 Mar 2017 19:47:37 +0000 (12:47 -0700)
commit8a338fb86a8c2f0fc7e2aa5be8a450e0bd5198b4
tree6236927d2d4eccefc60ba76435978864a4108c87
parent92a996a6ebb4f026761d5f6c8511a804d511eb36
parent484ffe3441c40f21ee983e39d18d0e04975c8361
Merge vk-gl-cts/master into aosp/deqp-dev
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp