Merge vk-gl-cts/master into vk-gl-cts/opengl-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 21 Jul 2017 17:32:05 +0000 (19:32 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 21 Jul 2017 17:32:05 +0000 (19:32 +0200)
Change-Id: I4d438f1dc0127a7d0965c95cf34e840037a71d0d


Trivial merge