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

Change-Id: I766949543602454bff23742a314d00c4532f41d5


Trivial merge