Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 17 Aug 2017 08:05:55 +0000 (10:05 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 17 Aug 2017 08:05:55 +0000 (10:05 +0200)
Change-Id: I2144843957db34a4d7e90f33d08740ecea0ee3ec


Trivial merge