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

Change-Id: I34a8d98620e522244bcc6e60da9173c5b7b00db1


Trivial merge