From: Pyry Haulos <phaulos@google.com>
Date: Tue, 9 May 2017 19:09:07 +0000 (-0700)
Subject: resolve merge conflicts of 9de005f0 to deqp-dev
X-Git-Tag: upstream/0.1.0~150^2~63
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ad40352ff86f055e04416d8c96d1a06eb33e52a;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of 9de005f0 to deqp-dev

Test: scripts/check_build_sanity.py
Change-Id: Ica45697139e9e63b0e407283780246d3608457e7
---

8ad40352ff86f055e04416d8c96d1a06eb33e52a