Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 00:51:47 +0000 (17:51 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 00:51:47 +0000 (17:51 -0700)
Change-Id: I9da42defc379185a24bfe39a3fb6ea7e0c71bd18


Trivial merge