Merge "CP: Require 'master' config to be supported in Android CTS am: 03d217bb53...
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 18:19:27 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:19:27 +0000 (18:19 +0000)
commitf2ebab30132e73562350af6f3efe12748c23b065
treeb3b5b918ef6d9a2a34665ce3b464fff6bc3d9ac8
parentc21f3c207da55512faaa5fddeda67c5f3ffbf781
parent636ad59ed821e0f4aab03e85836994562442e2a4
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

Change-Id: I999e13d8d7f1cf88a4fbb463bb0092d3c0815773