Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:14:16 +0000 (17:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:14:16 +0000 (17:14 +0000)
am: de7e3e2be7

Change-Id: I58554e0b05c826048a2851f8b0d42b2ebb24320a


Trivial merge