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


Trivial merge