Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 16:43:43 +0000 (16:43 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 13 Sep 2016 16:43:43 +0000 (16:43 +0000)

Trivial merge