Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:14:29 +0000 (06:14 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:14:29 +0000 (06:14 -0800)
commit5f81b2dd12471bfcbca3f3f838a63be3c2bdf773
tree4671a95de84ea709b11de11bbe57b1e457bb1365
parent5e83bab01f7880c4982cee79c2beae6ac28b9fb6
parent7204cb537808ed243c7d6fcf76453787f4e31716
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

Change-Id: Idb5dfa8e74faa0e6e9fe903ae4972d0da964c9e1