Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Tue, 29 Nov 2016 19:45:34 +0000 (11:45 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 29 Nov 2016 19:45:34 +0000 (11:45 -0800)
Change-Id: Ifc126593b72c46a6e73c4f4af20ab124a1f734b4


Trivial merge