From: Daniel Xie <dxie@google.com>
Date: Tue, 13 Sep 2016 19:16:38 +0000 (+0000)
Subject: Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts... 
X-Git-Tag: upstream/0.1.0~438^2~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e8cc8637b2ad28d7ebc40b64ed159b89ed0d718;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: e9835d0aa0 am: dcf24e8326
am: 910b6e1307

Change-Id: I34a8d98620e522244bcc6e60da9173c5b7b00db1
---

3e8cc8637b2ad28d7ebc40b64ed159b89ed0d718