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

Change-Id: I6ee82fc14e103e66fef989567c91e8af4b4d1300


Trivial merge