Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:45:00 +0000 (12:45 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:45:00 +0000 (12:45 -0800)
commitbb5cd6895df6414067574492db1387b4f32a0008
treecbe1d4e66e3f049bef75aef24fe3a413dcead878
parent4687bd003644d75b63a5e68bfe7d52b77e1a082c
parent0bc4c69e40d7f8e27de765735594c37a85b0e4d4
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

Change-Id: Ie32dbd8413b31f354882b5e114c281af4a9532eb
android/cts/master/vk-master.txt
external/vulkancts/mustpass/1.0.2/vk-default.txt