Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 6 Feb 2017 21:01:09 +0000 (13:01 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 6 Feb 2017 21:01:09 +0000 (13:01 -0800)
Change-Id: I72b86a6a9762bcaaa149c4f533ef91487bb9bdbb


Trivial merge