Merge vulkancts/vulkan-cts-1.0.2 into vulkancts/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 00:32:33 +0000 (16:32 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 00:32:33 +0000 (16:32 -0800)
Change-Id: I930987be3bb947d4fe51d9b931ed882f04e45a19


Trivial merge