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

Change-Id: I1b29b5eeca77fff3e8db9059a92bec74edd5060d


Trivial merge