Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:21 +0000 (16:43 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:21 +0000 (16:43 -0800)
commit83b847f6876a66e673e3de4fda3d4d03f424643b
tree9139551307f7c1ad71a855eb79a5adfda17c8691
parentae1efbd89dc15759f4543d21a0af8cf1079d704d
parente40c4546c9a5521311d0fd8a72073f890b670549
Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev

Change-Id: I598c6d52ece7b00a8dd0af10b31ea144ebc6ba80