Merge vulkan-cts-1.0 into vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Tue, 26 Apr 2016 12:24:16 +0000 (05:24 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 26 Apr 2016 12:24:16 +0000 (05:24 -0700)

Trivial merge