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)
commit113a5fa2a7f3d989efbaf331ed8087a71bfcdc0b
tree705fc399d5cd3ee08e54849844ac3fb4a66eaf52
parentb87d19b80432f89310dd86519c7ecb862be87e8d
parent51965e091683a9045dd392c08e6c1951e13efe46
Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev

Change-Id: I76f3c7db1863fe3fe69a114ff835968bdc3ea6d1