Merge vulkancts/vulkan-cts-1.0.2 into vulkancts/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Tue, 17 Jan 2017 22:25:01 +0000 (14:25 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 17 Jan 2017 22:25:01 +0000 (14:25 -0800)
Change-Id: I42ef5e23579c3c51667f102ac3379daf02537153


Trivial merge