Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 13 Feb 2017 18:34:40 +0000 (10:34 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 13 Feb 2017 18:34:40 +0000 (10:34 -0800)
Change-Id: Ie75f95c0972b43843398ca6d68fd39a538f23761


Trivial merge