Require 'master' config to be supported in Android CTS am: e232a6e83c am: 9fcccc3d5e...
authorPyry Haulos <phaulos@google.com>
Wed, 24 Aug 2016 15:45:32 +0000 (15:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 15:45:32 +0000 (15:45 +0000)
am: 984f215b5a

Change-Id: I47d3c844cac85779a768ed88a6a35c64c5e7faa1


Trivial merge