From: Mika Isojrvi <misojarvi@google.com>
Date: Thu, 16 Jun 2016 14:51:32 +0000 (+0000)
Subject: Merge goog/master@c8da37c into stage-aosp-master.
X-Git-Tag: upstream/0.1.0~438^2~1^2~147
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1fb5fe7dfe5f5a61b37d182f199ce858aef9187;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge goog/master@c8da37c into stage-aosp-master.
am: 38365a1634

Change-Id: I12f5f85447894cbefcccb3c38737856e6e5afb96
---

e1fb5fe7dfe5f5a61b37d182f199ce858aef9187