diff options
| author | Tony Mantler <nicoya@google.com> | 2014-03-05 11:27:46 -0800 |
|---|---|---|
| committer | Yu Ping Hu <yph@google.com> | 2014-03-10 22:56:48 +0000 |
| commit | d7fe0ed83e631d1e3a768e462ab9a270d3da90e2 (patch) | |
| tree | d3244907e730b525fa8f6c5e94aef79a5838871a /AndroidManifest.xml | |
| parent | 6621e1bf45b5a38f486928ed9da49adfd6f23451 (diff) | |
| download | android_packages_apps_Email-d7fe0ed83e631d1e3a768e462ab9a270d3da90e2.tar.gz android_packages_apps_Email-d7fe0ed83e631d1e3a768e462ab9a270d3da90e2.tar.bz2 android_packages_apps_Email-d7fe0ed83e631d1e3a768e462ab9a270d3da90e2.zip | |
Disambiguate providers between AOSP and EmailGoogle
b/13323222
Change-Id: I7d10182973b57e4c2c306739a15237952a7e6c95
(cherry picked from commit 9ef3c8b3f89970b49fd069634408ea56adcccf72)
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4bfebe2f9..3626eb4d6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -339,7 +339,7 @@ <!-- additional activities --> <provider - android:authorities="com.android.email2.conversation.provider" + android:authorities="com.android.email.conversation.provider" android:label="@string/conversation_content_provider" android:exported="true" android:name="com.android.mail.browse.EmailConversationProvider" > @@ -347,7 +347,7 @@ </provider> <provider - android:authorities="com.android.email2.accountcache" + android:authorities="com.android.email.accountcache" android:label="@string/account_cache_provider" android:exported="true" android:name="com.android.mail.providers.EmailAccountCacheProvider" > |