From: Pyry Haulos <phaulos@google.com>
Date: Wed, 3 May 2017 18:06:48 +0000 (+0000)
Subject: resolve merge conflicts of eb48f49dd to oc-dev
X-Git-Tag: upstream/0.1.0^2^2~9^2~106
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8938da88474d5faf6bc496050c2b33018d43eff;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of eb48f49dd to oc-dev
am: 7e37841e4f  -s ours

Change-Id: Id0436a84f2f097836264f593a7154475e1e328ab
---

a8938da88474d5faf6bc496050c2b33018d43eff