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)
commit5e67e8b2a9fa926712dad349974a454815498531
treef736cdf10dd4bd9f2e1e01913e1e74a35cb19d7d
parent7d4dd24ef59eebbd6c327e7f5766c6fac59e01c3
parent0db84f1b7d009c38e878769ffb8562d91190488a
Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/opengl-cts-dev

Change-Id: I3b3e5e6367a0b8aa998ddebd0ad238870c778e6b