Merge in changes from Khronos Vulkan CTS repository
authorPyry Haulos <phaulos@google.com>
Tue, 9 Feb 2016 18:40:59 +0000 (10:40 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 9 Feb 2016 18:40:59 +0000 (10:40 -0800)

Trivial merge