Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:44:58 +0000 (12:44 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:44:58 +0000 (12:44 -0800)
Change-Id: I5d98762111c8dba323a81a7179026d009f39934e


Trivial merge