From: Pyry Haulos <phaulos@google.com>
Date: Tue, 22 Aug 2017 19:39:29 +0000 (+0000)
Subject: resolve merge conflicts of ba455914 to master am: 07a7e24da3 am: 218bfe74ff am: e37a7... 
X-Git-Tag: upstream/0.1.0~117^2^2~325
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28cccdc48656b64268e1f17085fc1455e92b27aa;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of ba455914 to master am: 07a7e24da3 am: 218bfe74ff am: e37a75a4b9 am: 2d1edbcbc6
am: a1d7048d03

Change-Id: I1ba478d3d4dc3c3a881260781bf143b0b7ef2e0f
---

28cccdc48656b64268e1f17085fc1455e92b27aa