Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:18:40 +0000 (12:18 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:18:40 +0000 (12:18 -0800)
Change-Id: I3a85bd404f90b45cfb1305f6125c236518ffa4f4


Trivial merge