Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Mon, 14 Nov 2016 16:56:13 +0000 (08:56 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 14 Nov 2016 16:56:13 +0000 (08:56 -0800)
Change-Id: I090b008f3d9bd7a006138f5f3bbdd054d42c0d29


Trivial merge