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

Change-Id: Ic20ef1d7d0402dedca61904a326e0a98b4918ff0


Trivial merge