Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:16 +0000 (16:20 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:16 +0000 (16:20 -0800)
commit26a34a4c44ae467003c9f7b196cf5554749fefbe
treeccf8f0e8b51ac93c64bef5d00825a98209ec580d
parentc39883db49e40610ac1c97c414927d9791bb06bc
parent395444575c639062ea1b252f51743a8f90bef369
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

Change-Id: I39d2cf054236967b40c3756ee7b7961a7773679c