From: Daniel Xie <dxie@google.com>
Date: Tue, 13 Sep 2016 20:16:53 +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~620
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bb2e99278cccedc544d6f5b54b9a7bb814a6c42;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
am: 3e8cc8637b

Change-Id: I894f2dd0e8079df9155d412f8b0926dacd683242
---

4bb2e99278cccedc544d6f5b54b9a7bb814a6c42