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

Change-Id: Iab524605cba2e0af1fb34f3b304e4924012910f0


Trivial merge