Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Fri, 18 Nov 2016 17:48:25 +0000 (09:48 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 18 Nov 2016 17:48:25 +0000 (09:48 -0800)
Change-Id: I0800a091d1025c0ff6efc7f22f901285e198fd38


Trivial merge