Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 12:24:01 +0000 (04:24 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 12:24:01 +0000 (04:24 -0800)
Change-Id: I82eb4eb290e5d85b44ac2f1f2efb1eb88aef062a


Trivial merge