From: Brian Anderson <brianderson@google.com>
Date: Tue, 7 Nov 2017 21:24:40 +0000 (+0000)
Subject: Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev
X-Git-Tag: upstream/0.1.0^2^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0c5bf3e57e34b3a038548b2c3271bd9102ff325;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev
am: 67694b5635  -s ours

Change-Id: Iab0ab07eeedaf7f009610b79874d168e7a81eb53
---

f0c5bf3e57e34b3a038548b2c3271bd9102ff325