tree 262ca54f0bc29e66d47915b9aa11d4c4d3d42e07
parent 6c4b44558db339e9e1c9bb98be003ddecfd472f9
parent 3dfc1ab1aa4d88f582963bda2dc8a49b7c739a3a
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