Require 'master' config to be supported in Android CTS
authorPyry Haulos <phaulos@google.com>
Wed, 24 Aug 2016 15:23:51 +0000 (15:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 15:23:51 +0000 (15:23 +0000)
am: e232a6e83c

Change-Id: Ib4127ea5196485bc099c73fc4c79dd4fdceb3281


Trivial merge