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

Change-Id: Ic95669b52788fb2db64600d60d81dedb9922e131


Trivial merge