Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 13 Jan 2017 20:20:45 +0000 (12:20 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 13 Jan 2017 20:20:45 +0000 (12:20 -0800)
Change-Id: I570354cf0a0a6772ec7c46a701b0b57c11731cc2


Trivial merge