Merge vulkancts/opengl-cts-es-3.2.2 into vulkancts/opengl-cts-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 20 Jan 2017 10:21:49 +0000 (11:21 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 20 Jan 2017 10:21:49 +0000 (11:21 +0100)
Change-Id: Ia246cacb67f8e9f01f84533337efff66e40be757


Trivial merge