Merge "Merge "CP: Require 'master' config to be supported in Android CTS" into nougat...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:15:49 +0000 (18:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:15:49 +0000 (18:15 +0000)
commitb8b5e6966f2eaeae7cb511a742ad498746366d84
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent6b0491972e452df719f8b77deb7b981436e7ec2f
parent3f6493985f13d98b3f68ef207a02765b8862f30a
Merge "Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: 72e1df9930 am: f750d4ffc3 am: de7e3e2be7 am: 5b059bb044" into nyc-mr1-dev-plus-aosp am: 3381734324
am: 3f6493985f

Change-Id: I25852ad9f2be17c3cd1a625d1ab2269f6ee9aed2