Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:08:39 +0000 (18:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:08:39 +0000 (18:08 +0000)
am: 56270fdfb8

Change-Id: I13d70e83345a99fbc451721f00928b523634f7bf


Trivial merge