From: Mika Isojärvi <misojarvi@google.com>
Date: Fri, 22 Sep 2017 20:21:08 +0000 (+0000)
Subject: resolve merge conflicts of 9b726ab8 to master
X-Git-Tag: upstream/0.1.0^2^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1cc8aeac9ab7d00e86f2a997a4ad1e942157224;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of 9b726ab8 to master
am: 02473c7876

Change-Id: Ibd5f5c37ad2e3590fe5fa4d3512985178c0fb2a9
---

b1cc8aeac9ab7d00e86f2a997a4ad1e942157224