Merge in changes from Khronos Vulkan CTS repo
authorPyry Haulos <phaulos@google.com>
Mon, 15 Feb 2016 12:21:54 +0000 (04:21 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 15 Feb 2016 12:21:54 +0000 (04:21 -0800)

Trivial merge