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)
commitde7e3e2be791e1277691db35215f2f13a2546b00
treeae1b0012862592c74d57154112adba02f8202daf
parent0dd98a178bf5b7ef636834daf87136ec2cc89bf4
parentf750d4ffc3b2ddf2771c586035fe7c78c9bf0295
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: 72e1df9930
am: f750d4ffc3

Change-Id: Ic95669b52788fb2db64600d60d81dedb9922e131