am f21d48ba: am 53123c2f: (-s ours) DO NOT MERGE. Prevent duplication of POP3 attachments

Merge commit 'f21d48ba8512767b200b350dd04d1a1000ed6d6e' into eclair-mr2-plus-aosp

* commit 'f21d48ba8512767b200b350dd04d1a1000ed6d6e':
  DO NOT MERGE. Prevent duplication of POP3 attachments
This commit is contained in:
Andrew Stadler 2009-10-14 15:55:46 -07:00 committed by Android Git Automerger
commit 3c717848ea

Diff Content Not Available