Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:14:16 +0000 (17:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:14:16 +0000 (17:14 +0000)
commit5b059bb044b1980b4774f6371403744f69171efa
treeae1b0012862592c74d57154112adba02f8202daf
parenta08f0162cf90f3794772aa258d47940f7916b7e1
parentde7e3e2be791e1277691db35215f2f13a2546b00
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: 72e1df9930 am: f750d4ffc3
am: de7e3e2be7

Change-Id: I58554e0b05c826048a2851f8b0d42b2ebb24320a