CP: Require 'master' config to be supported in Android CTS am: 03d217bb53 am: e0c1316...
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 18:07:53 +0000 (18:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:07:53 +0000 (18:07 +0000)
am: 3b2f4f5e0f

Change-Id: I7568fbb21ec8d68ff3c15744db6c007e3a70c77a


Trivial merge