Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 22:53:05 +0000 (14:53 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 22:53:05 +0000 (14:53 -0800)
Change-Id: Ie87a52c0ab42568cb0e7d8761d8b717c6670b158


Trivial merge