Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:18:37 +0000 (12:18 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:18:37 +0000 (12:18 -0800)
Change-Id: Id438831009be51b1fb0afd60a1ab82d539246ea7


Trivial merge