am 551771d2: am ed58d8ed: Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb
am 551771d2: am ed58d8ed: Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb

* commit '551771d2f36d9f0cd958c5b2cc7217abf8f46ae8':
  Fix bug 3112733 - Missing TLS encryption option in manual email account setup

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base