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

Change-Id: Ib463be74c01c3bb56fcd049902b5d69785008dae


Trivial merge