tree f5cb2127a7cd4560d63267faffa3887a26058381
parent 14f2e1eed2b76fb6a8be787323353fa92a363a2a
parent 6973f559350bbf1b7efac562b0f16756662e3353
author Ta-wei Yen <twyen@google.com> 1479945609 +0000
committer android-build-merger <android-build-merger@google.com> 1479945609 +0000

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

Change-Id: I00bfe354abdf6b4edd8e41dc2ac3cc48ed7da079