Merge vulkan-cts-1.0 into vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Tue, 31 May 2016 16:29:45 +0000 (09:29 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 31 May 2016 16:29:45 +0000 (09:29 -0700)

Trivial merge