CP: Require 'master' config to be supported in Android CTS am: 03d217bb53 am: 5eaf6f9...
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 20:16:49 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:16:49 +0000 (20:16 +0000)
am: a0b233c828

Change-Id: Id849b1f198aecffa2dc54668d2c5231bed3a3250


Trivial merge