Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 21:32:37 +0000 (14:32 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 21:32:37 +0000 (14:32 -0700)
Change-Id: I2b277e75191041a5e18a268c45e20a0912ef3923


Trivial merge