Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 20 Apr 2017 16:38:34 +0000 (09:38 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 20 Apr 2017 16:38:34 +0000 (09:38 -0700)
Change-Id: I970a132b57dfe50bed70307c8264454decaab3a5


Trivial merge