From: Pyry Haulos <phaulos@google.com>
Date: Wed, 19 Oct 2016 19:16:03 +0000 (+0000)
Subject: resolve merge conflicts of e5f7483 to master
X-Git-Tag: upstream/0.1.0~445^2~122
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e2e181bd661d7f8b879898c2bf2965b0a515819;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of e5f7483 to master
am: c4598ea31b

Change-Id: I61aa10b24cfc71434506c5a83816ce42225b58fd
---

8e2e181bd661d7f8b879898c2bf2965b0a515819