Merge gerrit/vulkan-cts-1.0.2-extensions into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:15 +0000 (16:20 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:15 +0000 (16:20 -0800)
Change-Id: Iaf69a2f5942dce4fbd5b409690dc7f9a1a5f0b77


Trivial merge