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


Trivial merge