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

Change-Id: I5a9374fdb7183b3a0a1f5bc4d880217d27edb3dd


Trivial merge