Merge "CP: Require 'master' config to be supported in Android CTS am: 03d217bb53...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:15:11 +0000 (18:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:15:11 +0000 (18:15 +0000)
commitf0f4eace680af44c62da31e565591acdc43c6d79
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent08427f37dc1d75e7f183dbdbc8bfb6bde0bb35ca
parentf2ebab30132e73562350af6f3efe12748c23b065
Merge "CP: Require 'master' config to be supported in Android CTS am: 03d217bb53 am: e0c1316159 am: a2d72443d6 am: 0dd98a178b am: a08f0162cf" into nyc-mr1-dev-plus-aosp am: 636ad59ed8
am: f2ebab3013

Change-Id: Ib8af176d1e652962e1d8dcc9024868e9adaadb89