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

Change-Id: Ife2715575e55a709cda64fb854743d40cf38332c


Trivial merge