tree 520b3e78fc8b4e3259aa48e94ecc981b21d651ab
parent 2cb866b948c38923b31331a9b2f031eb9d791e6e
parent d2766aec6a72eb73264281472a5164a75c6df799
author Adam Powell <adamp@google.com> 1295485897 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295485897 -0800

Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb