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


Trivial merge