tree d160faef4ab0a01296e4978f3e55cde05380a98d
parent 9a1ffd65d4d12451a8ed86eaca85594f53b02de1
parent d5fdf40490033bbafbd946e92094b18e931c1a76
author Brian Muramatsu <btmura@android.com> 1331114958 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331114958 -0800

am d5fdf404: Merge "Fix STARTTLS handshake error in Email\'s SmtpSender class"

* commit 'd5fdf40490033bbafbd946e92094b18e931c1a76':
  Fix STARTTLS handshake error in Email's SmtpSender class