From: Pyry Haulos <phaulos@google.com>
Date: Wed, 14 Sep 2016 19:17:32 +0000 (+0000)
Subject: resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5
X-Git-Tag: upstream/0.1.0^2^2~618
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47091c824b0b8771cafbd81255c93d2a1ba27e23;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5
am: f47f5ecf0b

Change-Id: I8c6b0e792ca70866df83d96a6ce2cd6ef24e1f9f
---

47091c824b0b8771cafbd81255c93d2a1ba27e23