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

resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71
am: 29baf28a2f

Change-Id: Ic5e033debdc6cafba026c9f40efaab8c4f83f746
---

cc191e57bfb8c4021fbb6c4008557a62d19b74ce