CP: Require 'master' config to be supported in Android CTS am: 03d217bb53
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 17:15:09 +0000 (17:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:15:09 +0000 (17:15 +0000)
am: e0c1316159

Change-Id: I7fb762a09b8f7e004f11f64c1387bb120890d516


Trivial merge