From: Mika Isojärvi <misojarvi@google.com>
Date: Fri, 22 Sep 2017 20:25:08 +0000 (+0000)
Subject: resolve merge conflicts of 9b726ab8 to master am: 02473c7876
X-Git-Tag: upstream/1.3.5~1974^2~8^2~105^2~101^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3cf47e265d4bf2d6444fd45e4fabb5edeea3e24;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of 9b726ab8 to master am: 02473c7876
am: b1cc8aeac9

Change-Id: I9511ee86a53661327a19ca4793e45ac933cb2d1c
---

f3cf47e265d4bf2d6444fd45e4fabb5edeea3e24