Merge vulkan-cts-1.0 to master
authorPyry Haulos <phaulos@google.com>
Mon, 22 Feb 2016 18:09:19 +0000 (10:09 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 22 Feb 2016 18:09:19 +0000 (10:09 -0800)

Trivial merge