From: Daniel Xie <dxie@google.com>
Date: Tue, 22 Aug 2017 18:11:43 +0000 (+0000)
Subject: Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts... 
X-Git-Tag: upstream/0.1.0~117^2^2~588
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e8a4378edaa1c0fe47c391c1cbe6b971b83f4b0;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: 72e1df9930 am: 90bef986f4 am: 56270fdfb8
am: 4fbd59a8c5

Change-Id: Id2a462100d3253128d0a9d22786a6dbfffaec717
---

3e8a4378edaa1c0fe47c391c1cbe6b971b83f4b0