Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:21 +0000 (16:43 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:21 +0000 (16:43 -0800)
Change-Id: I598c6d52ece7b00a8dd0af10b31ea144ebc6ba80


Trivial merge