CP: Require 'master' config to be supported in Android CTS am: 03d217bb53 am: 5eaf6f98bd
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 19:12:38 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:12:38 +0000 (19:12 +0000)
am: ca2f7af916

Change-Id: Ica084483e8ad0446a35484fb4811a589d4f2b2d4


Trivial merge