From: Pyry Haulos <phaulos@google.com>
Date: Tue, 13 Sep 2016 19:05:21 +0000 (+0000)
Subject: resolve merge conflicts of 3ffc2f2 to master
X-Git-Tag: upstream/0.1.0~438^2~1^2~1^2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b43199cd47fe3459571ed315e56c41e1759916d1;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of 3ffc2f2 to master
am: f2c82779ae

Change-Id: If42ab81eae41f7e0c61abb4997df4221361fd0b7
---

b43199cd47fe3459571ed315e56c41e1759916d1