Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Wed, 16 Nov 2016 20:23:37 +0000 (12:23 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 16 Nov 2016 20:23:37 +0000 (12:23 -0800)
Change-Id: I7018a06b0678170fb54a958d667db6c9e6c1393f


Trivial merge