am d96c94aa: am ae29ac17: am 572e0087: Merge change Idfc116fe into eclair

Merge commit 'd96c94aa93b3331213d0ec781d0593bccfb61c03'

* commit 'd96c94aa93b3331213d0ec781d0593bccfb61c03':
  Return null if SIM doesn't have the MSISDN Aplha tag.

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

@@ -871,16 +871,7 @@ public class GSMPhone extends PhoneBase {
     }
 
     public String getLine1AlphaTag() {
-        String ret;
-
-        ret = mSIMRecords.getMsisdnAlphaTag();
-
-        if (ret == null || ret.length() == 0) {
-            return mContext.getText(
-                    com.android.internal.R.string.defaultMsisdnAlphaTag).toString();
-        }
-
-        return ret;
+        return mSIMRecords.getMsisdnAlphaTag();
     }
 
     public void setLine1Number(String alphaTag, String number, Message onComplete) {