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

resolve merge conflicts of 3ffc2f2 to master am: f2c82779ae am: b43199cd47
am: 93119248d0

Change-Id: I79d317d122e5b9f7d1dea940ae7db4f940018d1d
---

1f61a3ca8e088c81250c0f8cbe6528bc11a83a1f