Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:24:42 +0000 (18:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:24:42 +0000 (18:24 +0000)
commitf2d22a9a75ff52d5f0e37ba36c4c54b43e77915b
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parentb3f72e66958669d50c32247bd596226cb41b8f55
parent4bb2e99278cccedc544d6f5b54b9a7bb814a6c42
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: e9835d0aa0 am: dcf24e8326 am: 910b6e1307 am: 3e8cc8637b
am: 4bb2e99278

Change-Id: Ic1ecf0b0ac4a730d487c5d7192107807c56b3d6b