AI 144245: Fix merge conflict for megering in the CDMA changes in to master from...

Automated import of CL 144245

diff --git a/src/com/android/im/imps/SmsCirChannel.java b/src/com/android/im/imps/SmsCirChannel.java
index 84f01ee..24ece3b 100644 (file)
--- a/src/com/android/im/imps/SmsCirChannel.java
+++ b/src/com/android/im/imps/SmsCirChannel.java
@@ -22,8 +22,8 @@ import com.android.im.engine.SmsService;
 import com.android.im.engine.SystemService;
 import com.android.im.engine.SmsService.SmsListener;
 import com.android.im.engine.SmsService.SmsSendFailureCallback;
-import com.android.internal.telephony.gsm.EncodeException;
-import com.android.internal.telephony.gsm.GsmAlphabet;
+import com.android.internal.telephony.EncodeException;
+import com.android.internal.telephony.GsmAlphabet;
 
 public class SmsCirChannel extends CirChannel
         implements SmsListener, SmsSendFailureCallback {

diff --git a/src/com/android/im/service/AndroidSmsService.java b/src/com/android/im/service/AndroidSmsService.java
index d1dda41..ddcb24e 100644 (file)
--- a/src/com/android/im/service/AndroidSmsService.java
+++ b/src/com/android/im/service/AndroidSmsService.java
@@ -31,8 +31,8 @@ import android.net.Uri;
 import android.provider.Telephony;
 import static android.provider.Telephony.Sms.Intents.DATA_SMS_RECEIVED_ACTION;
 import android.telephony.PhoneNumberUtils;
-import android.telephony.gsm.SmsManager;
-import android.telephony.gsm.SmsMessage;
+import android.telephony.SmsManager;
+import android.telephony.SmsMessage;
 import android.util.Log;
 
 import com.android.im.engine.SmsService;