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

f750d4ffc3b2ddf2771c586035fe7c78c9bf0295