Merge vulkan-cts-1.0 to master
authorPyry Haulos <phaulos@google.com>
Fri, 26 Feb 2016 23:19:21 +0000 (15:19 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 26 Feb 2016 23:19:21 +0000 (15:19 -0800)

Trivial merge