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


Trivial merge