Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:42:59 +0000 (06:42 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:42:59 +0000 (06:42 -0800)
Change-Id: I061ec26cc7b0e645a5c226659d051e7e12857d90


Trivial merge