Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Wed, 12 Apr 2017 04:04:36 +0000 (12:04 +0800)
committerPyry Haulos <phaulos@google.com>
Wed, 12 Apr 2017 04:04:36 +0000 (12:04 +0800)
Change-Id: I396972ad31a87e7e88b69c05595393af3f990540


Trivial merge