Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:59:03 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:59:03 +0000 (18:59 +0000)
commite9835d0aa0308c4b30c46f4657d2c885091a4e25
treed45289fd9ce56c6b8363d509c9ff36e528a7f5c5
parent5eaf6f98bd9e4d12605f06877029ee2bd7274a0d
parent84173082eea39478429b9408e683ac7df938e60e
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev
am: 84173082ee

Change-Id: I766949543602454bff23742a314d00c4532f41d5