From: Daniel Xie <dxie@google.com>
Date: Tue, 13 Sep 2016 17:15:10 +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~1^2~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90bef986f4e5df4755e967e97b6944315f23432b;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

Change-Id: I5a9374fdb7183b3a0a1f5bc4d880217d27edb3dd
---

90bef986f4e5df4755e967e97b6944315f23432b