Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Thu, 23 Mar 2017 16:28:55 +0000 (09:28 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 23 Mar 2017 16:28:55 +0000 (09:28 -0700)
Change-Id: I713757dc320eb8c0d9fa941f0c286807d09924e9


Trivial merge