Merge gerrit/vulkan-cts-1.0.2-extensions into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:14:29 +0000 (06:14 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:14:29 +0000 (06:14 -0800)
Change-Id: Icb2bfab51004eedcbb1629a2e00dcb4a89a7dc50


Trivial merge