Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:18 +0000 (16:20 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:18 +0000 (16:20 -0800)
Change-Id: I6ae311b56b24f91aae76a908b8086bcc8afeaacf


Trivial merge