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

Merge commit 'ae29ac179ee579234ecc6ed590e00d30831e02f8' into eclair-mr2-plus-aosp

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

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

@@ -879,16 +879,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) {