tree eca53f917ba2d744ed113f557fe6b469b776d7ca
parent 1cb946599dd3fb8ee0f31e9f93dd9d9817e91c9b
parent 097cf4cf58463d833fd2342efe48763342af109f
author Ta-wei Yen <twyen@google.com> 1479944817 +0000
committer android-build-merger <android-build-merger@google.com> 1479944817 +0000

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

Change-Id: I07082681c86d7c61bff91879e06e55827f4c25e5