From: Pyry Haulos <phaulos@google.com>
Date: Tue, 22 Aug 2017 18:15:11 +0000 (+0000)
Subject: Merge "CP: Require 'master' config to be supported in Android CTS am: 03d217bb53... 
X-Git-Tag: upstream/0.1.0~117^2^2~578
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0f4eace680af44c62da31e565591acdc43c6d79;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge "CP: Require 'master' config to be supported in Android CTS am: 03d217bb53 am: e0c1316159 am: a2d72443d6 am: 0dd98a178b am: a08f0162cf" into nyc-mr1-dev-plus-aosp am: 636ad59ed8
am: f2ebab3013

Change-Id: Ib8af176d1e652962e1d8dcc9024868e9adaadb89
---

f0f4eace680af44c62da31e565591acdc43c6d79