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

Change-Id: I720780531cfc17eae2c9ac644b4c524bbfedd0ec


Trivial merge