Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 13:55:34 +0000 (05:55 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 13:56:50 +0000 (05:56 -0800)
Change-Id: I76f3c7db1863fe3fe69a114ff835968bdc3ea6d1


Trivial merge