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

Change-Id: If3d03aa1044822119b1c9e3d28e5e63c3a33d677


Trivial merge