Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 9 Dec 2016 19:22:19 +0000 (11:22 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 9 Dec 2016 19:22:19 +0000 (11:22 -0800)
commitb1e81dd1f12cf6eba43a8bc5116cf7f059e8b63f
treeff0c8ef3da5bb3204e5970ecd2ce46a38151ffda
parent8b362767f3981bcacd190362b5009c50b684a9ea
parent7230753d656a0b9d546f5e5902a48e24960d41e7
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

Change-Id: Ida5d86fce49cae128f90d86001eb7037e61dbe62