From: Daniel Xie <dxie@google.com>
Date: Tue, 22 Aug 2017 18:18:45 +0000 (+0000)
Subject: Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: 89da6ddd7b... 
X-Git-Tag: upstream/0.1.0~117^2^2~565
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3feb68231dd1d77da6697854305cde45936169e6;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: 89da6ddd7b am: e61860906b am: baa7680368 am: b403c19524
am: b6d1e63153

Change-Id: I9c160f3986f13d7f9547b6d243c2b4ec1db1c157
---

3feb68231dd1d77da6697854305cde45936169e6