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)
am: f2ebab3013

Change-Id: Ib8af176d1e652962e1d8dcc9024868e9adaadb89


Trivial merge