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


Trivial merge