am 4ad335f8: Compare only network portion to determine if number is voicemail.
Merge commit '4ad335f8c80c1d588426ef796afdd1a682eecd29' into gingerbread
* commit '4ad335f8c80c1d588426ef796afdd1a682eecd29':
Compare only network portion to determine if number is voicemail.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1fae984..09bdb1d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,6 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
android:sharedUserId="android.uid.shared"
+ android:sharedUserLabel="@string/sharedUserLabel"
>
<original-package android:name="com.android.contacts" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 31e64c3..facf34c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,6 +14,10 @@
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Label for this app's shared user ID (and thus for all other
+ apps sharing the uid). -->
+ <string name="sharedUserLabel">Android Core Apps</string>
+
<!-- Title for the activity that shows contacts. This is the name
used in the Launcher icon. -->
<string name="contactsList">Contacts</string>