Merge "Can't explain that!" into jb-ub-mail

This commit is contained in:
Marc Blank 2012-08-01 11:31:46 -07:00 committed by Android (Google) Code Review
commit d89d702a65

View File

@ -52,7 +52,7 @@
email:protocol="pop3"
email:name="POP3"
email:accountType="com.android.email"
email:serviceClass="com.android.email.service.ImapService"
email:serviceClass="com.android.email.service.Pop3Service"
email:port="110"
email:portSsl="995"
email:syncIntervalStrings="@array/account_settings_check_frequency_entries"
@ -67,7 +67,7 @@
email:protocol="imap"
email:name="IMAP"
email:accountType="com.android.email"
email:serviceClass="com.android.email.service.Pop3Service"
email:serviceClass="com.android.email.service.ImapService"
email:port="143"
email:portSsl="993"
email:syncIntervalStrings="@array/account_settings_check_frequency_entries"