From: Nicolas Boichat <drinkcat@google.com>
Date: Tue, 20 Dec 2016 22:24:55 +0000 (+0000)
Subject: resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f
X-Git-Tag: upstream/0.1.0~361^2~230^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=108d39675da6b7d72422666b05e82deb24346293;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f
am: 52bab3789f

Change-Id: Ie5115233fc6bef645f14f03e69039188dfd6d908
---

108d39675da6b7d72422666b05e82deb24346293