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

Change-Id: I6bcb7fa13f85b79facb6d2eef65a2d0310b4f5b6


Trivial merge