Merge vulkan-cts-1.0 into vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Thu, 21 Apr 2016 18:12:54 +0000 (11:12 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 21 Apr 2016 18:12:54 +0000 (11:12 -0700)

Trivial merge