Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Thu, 8 Dec 2016 19:56:26 +0000 (11:56 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 8 Dec 2016 19:56:26 +0000 (11:56 -0800)
Change-Id: Ic004e8f199538e1d22dded2b41b62f44d1e47e39


Trivial merge