Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:07:35 +0000 (19:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:07:35 +0000 (19:07 +0000)
commitdcf24e832610fd8cdc5341984564e5a9dfe9614d
treed45289fd9ce56c6b8363d509c9ff36e528a7f5c5
parentca2f7af916eb50996b61b6bead2a746fe00f3bf7
parente9835d0aa0308c4b30c46f4657d2c885091a4e25
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee
am: e9835d0aa0

Change-Id: Ife2715575e55a709cda64fb854743d40cf38332c