From: Nicolas Boichat Date: Tue, 20 Dec 2016 22:34:40 +0000 (+0000) Subject: resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am... X-Git-Tag: upstream/0.1.0^2^2~508 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5b456769bbe12943babd641383c57d82ab4b9d3;p=platform%2Fupstream%2FVK-GL-CTS.git resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am: 52bab3789f am: 108d39675d Change-Id: Iee9f8deb6d1fee977e59d58a97d0b0f2b4e56129 --- e5b456769bbe12943babd641383c57d82ab4b9d3