Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 8 Dec 2016 19:56:25 +0000 (11:56 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 8 Dec 2016 19:56:25 +0000 (11:56 -0800)
Change-Id: Ia886113c781d84a63af054a5692c23eba1cb6bf8


Trivial merge