Merge gerrit/vulkan-cts-1.0.2-extensions into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:44:59 +0000 (12:44 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:44:59 +0000 (12:44 -0800)
Change-Id: Ie495cb0ecf07ff898e1d15f98361cf1af835f304


Trivial merge