Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Sun, 8 Jul 2018 12:45:05 +0000 (14:45 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Sun, 8 Jul 2018 12:45:05 +0000 (14:45 +0200)
Change-Id: I5cc2ec5db45c7389e4371f10cf5c68186b43169e


Trivial merge