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


Trivial merge