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

Change-Id: I999e13d8d7f1cf88a4fbb463bb0092d3c0815773


Trivial merge