Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
authorPyry Haulos <phaulos@google.com>
Fri, 9 Dec 2016 19:21:40 +0000 (11:21 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 9 Dec 2016 19:21:40 +0000 (11:21 -0800)
Change-Id: I3ac10a34c6169dccad99dc99346f178470c26056

1  2 
external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp