am a8c79a8c: am 90aaaef5: Merge change I0e200c3c into eclair

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

* commit 'a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b':
  Sending UCS2 encoded SMS correctly

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

@@ -280,6 +280,7 @@ public class SmsMessage extends SmsMessageBase{
             // send it as a UCS-2 encoded message
             try {
                 userData = encodeUCS2(message, header);
+                encoding = ENCODING_16BIT;
             } catch(UnsupportedEncodingException uex) {
                 Log.e(LOG_TAG,
                         "Implausible UnsupportedEncodingException ",