Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Sat, 10 Dec 2016 18:40:12 +0000 (10:40 -0800)
committerPyry Haulos <phaulos@google.com>
Sat, 10 Dec 2016 18:40:12 +0000 (10:40 -0800)
Change-Id: I4d2ef04a4c3bb44a40888cc859d9288f8b4949ef


Trivial merge