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


Trivial merge