From: Pyry Haulos <phaulos@google.com>
Date: Wed, 14 Sep 2016 20:03:34 +0000 (+0000)
Subject: resolve merge conflicts of b172f9e to master
X-Git-Tag: upstream/0.1.0~438^2~1^2~1^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=657bfbfb71b75b63d7ab78afa50ec321bd5f0b06;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of b172f9e to master
am: ed8e08ff82

Change-Id: I87eea013265484e330874608de507e8f6c193e02
---

657bfbfb71b75b63d7ab78afa50ec321bd5f0b06