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

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

Change-Id: I21523670469267f399b8dd564429db738916b322
---

9e62d162fc9cb4a23fee568a7f348302dd2040f2