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


Trivial merge