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

Change-Id: Ibdbea47f5ec55ca7ab47bdd4f5d21eed26087eb1


Trivial merge