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

Change-Id: Ifdf41fd7cc76a0dc13528ca8ebfee3c1d90fe7f1


Trivial merge