CP: Require 'master' config to be supported in Android CTS am: 03d217bb53 am: 5eaf6f9...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:24:23 +0000 (18:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:24:23 +0000 (18:24 +0000)
am: 46e3804f97

Change-Id: I6b9167e37a548a71b0049dac7c8f035304a763fa


Trivial merge