tree 5747e81e77e7055e8a2d49a85373bbbc94ca390f
parent 7b17c37e219c9af660b84f841d0b3a967b13b55a
parent ae3f7dfb285277965831fa4304ceeec6f912a9c9
author Ta-wei Yen <twyen@google.com> 1477351993 +0000
committer android-build-merger <android-build-merger@google.com> 1477351993 +0000

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

Change-Id: Ibe645096924cd86020f74ee892a4161a819379fa