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)
commitb82c143c45a83fcabc08ac0be570d499dd0d894b
tree014757c2f8a7615f850a416d4cb7296a358a8ca6
parent555ed53736072fc9b50993cbc0550a70902a0bf9
parent9692d0318a423f57a9c200190ac68fb3e36faba6
Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev

Change-Id: I3a85bd404f90b45cfb1305f6125c236518ffa4f4