From: Pyry Haulos <phaulos@google.com>
Date: Tue, 13 Sep 2016 18:07:48 +0000 (+0000)
Subject: resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am: 921c48e50a
X-Git-Tag: upstream/0.1.0^2^2~665
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5dbe5eec13014563762aa8672441ece0114678f;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am: 921c48e50a
am: eeb08c7a18

Change-Id: I9d948105b5a8c37ec3d178011e4846861b873c52
---

d5dbe5eec13014563762aa8672441ece0114678f