Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:17 +0000 (12:21 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:17 +0000 (12:21 -0800)
Change-Id: I027046f847315da035a19ae1267d18bea84e67b2


Trivial merge