Merge vulkan-cts-1.0 into vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Wed, 13 Apr 2016 22:18:01 +0000 (15:18 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 13 Apr 2016 22:18:01 +0000 (15:18 -0700)

Trivial merge