Merge ee4c17ee from gingerbread

Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690

diff --cc core/java/android/provider/Telephony.java
index 803446f,940bd24..1a35112
mode 100644,100755..100755
--- 1/core/java/android/provider/Telephony.java
--- 2/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java

diff --cc telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
index 40ee0b0,49fa5da..fcdf83b
mode 100644,100755..100755
--- 1/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
--- 2/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
@@@ -22,11 -22,9 +22,12 @@@ import android.app.PendingIntent.Cancel
  import android.content.Intent;
  import android.os.AsyncResult;
  import android.os.Message;
 +import android.os.SystemProperties;
+ import android.provider.Telephony.Sms;
  import android.provider.Telephony.Sms.Intents;
  import android.telephony.ServiceState;
 +import android.telephony.SmsCbMessage;
 +import android.telephony.gsm.GsmCellLocation;
  import android.util.Config;
  import android.util.Log;