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

Change-Id: Iab0ab821a46aaf52791f91691077da429f8a1807


Trivial merge