tree 5747e81e77e7055e8a2d49a85373bbbc94ca390f
parent 28711febaa055381a741501083d5587832330525
parent 95a99c152381baa831d934dd1cde2b852021c0fe
author Ta-wei Yen <twyen@google.com> 1477352213 +0000
committer android-build-merger <android-build-merger@google.com> 1477352213 +0000

Merge "Disable STARTTLS for Orange FR" into nyc-mr1-dev am: ae3f7dfb28
am: 95a99c1523

Change-Id: Idf929ee0589a124fb418838f799b23d0da9dede3