Merge gerrit/vulkan-cts-1.0.2-extensions into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:15 +0000 (12:21 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:15 +0000 (12:21 -0800)
Change-Id: I3fbe67feeb37915d1e41b5f88a40546adbdbffa8


Trivial merge