Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Sat, 10 Dec 2016 18:40:10 +0000 (10:40 -0800)
committerPyry Haulos <phaulos@google.com>
Sat, 10 Dec 2016 18:40:10 +0000 (10:40 -0800)
Change-Id: I576fe0555a21a4bc481541f844342ee73991a73a


Trivial merge