Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:14 +0000 (16:20 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:20:14 +0000 (16:20 -0800)
Change-Id: I4b9cb490746a875501c5213b0a5899a3a487be03


Trivial merge