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

Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am: 52bab3789f" into nyc-mr2-dev-plus-aosp
am: a048f0632d

Change-Id: I8ec1b04a550e3f8329d29556aac89612ea03088e
---

4f3d8a3a2c8e14c07314de04ebc3c4d31d7d1cc5