Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 13 Feb 2017 19:06:24 +0000 (11:06 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 13 Feb 2017 19:06:24 +0000 (11:06 -0800)
commitd881188658cf52d43b9e9b5d750f25fcf9e01783
tree994213839d66db8385460c4798ae17597437759f
parent2016920fb47c68e73783dc1f7b10ebeaa35ffd35
parentbd578c3d92217d1f2e03847c7f3d65991cb4f9cb
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: I0fc80b05b1d3a795fff26f6c971e57064d224478
android/cts/master/src/vk-excluded-tests.txt
android/cts/master/vk-master.txt