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


Trivial merge