From: Pyry Haulos <phaulos@google.com>
Date: Mon, 25 Jul 2016 20:48:34 +0000 (+0000)
Subject: Merge changes I219c2b3a,I7af6fe67 am: 01cc5733ba
X-Git-Tag: upstream/0.1.0~438^2~175
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=822f089731443f9f1aa961a919a0ace61f7892d2;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge changes I219c2b3a,I7af6fe67 am: 01cc5733ba
am: 7d8ddf4d02

Change-Id: I4a2e8bb5d0a016f094aa5c40b6717a14c4c6166f
---

822f089731443f9f1aa961a919a0ace61f7892d2