CP: Require 'master' config to be supported in Android CTS am: 03d217bb53 am: e0c1316...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:14:51 +0000 (18:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:14:51 +0000 (18:14 +0000)
am: c21f3c207d

Change-Id: I8b17a10feff9feffa3e98d8369584114b2c08dae


Trivial merge