Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 18:43:38 +0000 (11:43 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 18:43:38 +0000 (11:43 -0700)
Change-Id: Id9ed2c01d94891313742d06249968b246a2d216c


Trivial merge