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)
commit863b9afb4e688863c2c539509c764474c24d75c6
treecd005cb99aa55ae1ddddeab9279cfb58ad0a0edd
parent5ad5f7058227a9a90606e54c84b86ad5db56e1ce
parent38c053d67124be0cacfb05d6883015d140dc7c6b
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

Change-Id: Ia886113c781d84a63af054a5692c23eba1cb6bf8