Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:07:06 +0000 (16:07 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:07:06 +0000 (16:07 -0800)

Trivial merge