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


Trivial merge