Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
authorPyry Haulos <phaulos@google.com>
Mon, 22 Aug 2016 19:48:36 +0000 (12:48 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 22 Aug 2016 19:48:36 +0000 (12:48 -0700)
Change-Id: I70aadacf71364b934cb0340752176490b65d637d


Trivial merge