Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:13 +0000 (12:21 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:13 +0000 (12:21 -0800)
Change-Id: I03ac764c0248a7df434ff871abded41b1b03823e


Trivial merge