Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:42:57 +0000 (06:42 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:42:57 +0000 (06:42 -0800)
Change-Id: Iefeb4eb750808e3879105ded1980b30cb771e938


Trivial merge