Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Thu, 9 Feb 2017 17:54:41 +0000 (09:54 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 9 Feb 2017 17:54:41 +0000 (09:54 -0800)
Change-Id: Ia916f3edd0d85b78a7a109c0605908fd8c7793cb


Trivial merge