am a01c8522: Merge "Revert "Revert "Remove extra Imap authenticator"" :)" into jb-ub-mail-ur9

* commit 'a01c85229b61b3deb412180e7212bf296f9a83b6':
  Revert "Revert "Remove extra Imap authenticator""  :)
This commit is contained in:
Paul Westbrook 2013-03-13 00:33:16 +00:00 committed by Android Git Automerger
commit c0b9450c2b

View File

@ -438,7 +438,7 @@
<service <service
android:name=".service.ImapAuthenticatorService" android:name=".service.ImapAuthenticatorService"
android:exported="true" android:exported="true"
android:enabled="true" android:enabled="false"
> >
<intent-filter> <intent-filter>
<action <action
@ -566,20 +566,6 @@
android:resource="@xml/authenticator_alternate" android:resource="@xml/authenticator_alternate"
/> />
</service> </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 <service
android:name=".service.LegacyImapAuthenticatorService" android:name=".service.LegacyImapAuthenticatorService"