Merge "Remove extra Imap authenticator" into jb-ub-mail-ur9

This commit is contained in:
Paul Westbrook 2013-03-12 22:25:13 +00:00 committed by Android (Google) Code Review
commit 9ab4553ea8

View File

@ -438,7 +438,7 @@
<service
android:name=".service.ImapAuthenticatorService"
android:exported="true"
android:enabled="true"
android:enabled="false"
>
<intent-filter>
<action
@ -566,20 +566,6 @@
android:resource="@xml/authenticator_alternate"
/>
</service>
<service
android:name=".service.ImapAuthenticatorService"
android:exported="true"
android:enabled="true"
>
<intent-filter>
<action
android:name="android.accounts.AccountAuthenticator" />
</intent-filter>
<meta-data
android:name="android.accounts.AccountAuthenticator"
android:resource="@xml/authenticator_imap"
/>
</service>
<service
android:name=".service.LegacyImapAuthenticatorService"