Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 26 Jul 2018 12:44:32 +0000 (14:44 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 26 Jul 2018 12:44:32 +0000 (14:44 +0200)
Change-Id: I8f337795a44a35d1058412c49c09702b297203ca


Trivial merge