From: Pyry Haulos <phaulos@google.com>
Date: Wed, 14 Sep 2016 19:02:29 +0000 (+0000)
Subject: resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
X-Git-Tag: upstream/0.1.0~438^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f47f5ecf0bb0e0be66ce5bb85edbb9a0bb6da089;p=platform%2Fupstream%2FVK-GL-CTS.git

resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
am: 0d151184d5

Change-Id: I25450768dbdbadf87b17e51453a64c7f7ac7a433
---

f47f5ecf0bb0e0be66ce5bb85edbb9a0bb6da089