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


Trivial merge