Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:14:29 +0000 (06:14 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:14:29 +0000 (06:14 -0800)
Change-Id: Idb5dfa8e74faa0e6e9fe903ae4972d0da964c9e1


Trivial merge