From: Pyry Haulos <phaulos@google.com>
Date: Fri, 27 May 2016 15:03:27 +0000 (-0700)
Subject: resolve merge conflicts of 9a6dd53 to master
X-Git-Tag: upstream/0.1.0~828
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=895215ffe65f5ff1a572039e0cca7edb556753f3;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of 9a6dd53 to master

Change-Id: Idb8abdf776d6ece74a2fdfab3941678c9813eea0
---

895215ffe65f5ff1a572039e0cca7edb556753f3