Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:15 +0000 (12:21 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:15 +0000 (12:21 -0800)
commit98d1249e3bffaa1fd5fc99eaa0e71fa76e25cbc1
tree50c625738b0cbd7bde91a55235fca2065616b717
parent278022f27cb001fadd2976136ebce297b1e440ca
parentcaec50b78d5dd608b740ed9dd6ca745c3cb37119
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

Change-Id: I01010b00d0f3a98b4d4908bf0d94a824ae96ff97