Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Sun, 22 Apr 2018 20:39:57 +0000 (22:39 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Sun, 22 Apr 2018 20:39:57 +0000 (22:39 +0200)
Change-Id: I2982ab13ab697578f4206db28a55074b4344e68d


Trivial merge