Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Sun, 18 Jun 2017 12:32:55 +0000 (14:32 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Sun, 18 Jun 2017 12:32:55 +0000 (14:32 +0200)
Change-Id: Ibc1539846ed2f43f1f38cb8460cba52b28cbaa0a


Trivial merge