From: David Sodman Date: Thu, 22 Dec 2016 03:06:13 +0000 (-0800) Subject: resolve merge conflicts of b81edb4 to master X-Git-Tag: upstream/0.1.0~445^2~89 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce5292f5844e6d40714ccb5d6ec33919a3f3ab0c;p=platform%2Fupstream%2FVK-GL-CTS.git resolve merge conflicts of b81edb4 to master Change-Id: I16c7230358a1758afe1bc9ca2b22ae6eff2490b7 --- ce5292f5844e6d40714ccb5d6ec33919a3f3ab0c