diff options
| author | Wink Saville <> | 2009-04-02 11:00:56 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-02 11:00:56 -0700 |
| commit | 3f8f177ff27be82c4faf94796d60e2efa2a17525 (patch) | |
| tree | cc8007292e13595f60b920168bd671b6b66ac57c /src/com/android/im | |
| parent | 055fe25bc8b70db921cf17bd2b269bc6a5050ce7 (diff) | |
| download | IM-3f8f177ff27be82c4faf94796d60e2efa2a17525.tar.gz | |
AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
Diffstat (limited to 'src/com/android/im')
| -rw-r--r-- | src/com/android/im/imps/SmsCirChannel.java | 4 | ||||
| -rw-r--r-- | src/com/android/im/service/AndroidSmsService.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/im/imps/SmsCirChannel.java b/src/com/android/im/imps/SmsCirChannel.java index 84f01ee..24ece3b 100644 --- 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 --- 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; |