Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Tue, 15 Nov 2016 22:14:56 +0000 (14:14 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 15 Nov 2016 22:14:56 +0000 (14:14 -0800)
Change-Id: I6dd9eaff0cc9ba89a1def422938032d5182c8447


Trivial merge