Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:11:43 +0000 (18:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:11:43 +0000 (18:11 +0000)
am: 4fbd59a8c5

Change-Id: Id2a462100d3253128d0a9d22786a6dbfffaec717


Trivial merge