From: Daniel Xie <dxie@google.com>
Date: Tue, 13 Sep 2016 18:08:39 +0000 (+0000)
Subject: Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts... 
X-Git-Tag: upstream/0.1.0^2^2~660
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fbd59a8c5e5aed0c87b24843f7c7cd9dea6efee;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

Change-Id: I13d70e83345a99fbc451721f00928b523634f7bf
---

4fbd59a8c5e5aed0c87b24843f7c7cd9dea6efee