Merge remote-tracking branch 'upstream/ics'

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/attachment_editor_bg.9.png
	res/drawable-hdpi/emo_im_angel.png
	res/drawable-hdpi/emo_im_cool.png
	res/drawable-hdpi/emo_im_crying.png
	res/drawable-hdpi/emo_im_embarrassed.png
	res/drawable-hdpi/emo_im_foot_in_mouth.png
	res/drawable-hdpi/emo_im_happy.png
	res/drawable-hdpi/emo_im_heart.png
	res/drawable-hdpi/emo_im_kissing.png
	res/drawable-hdpi/emo_im_laughing.png
	res/drawable-hdpi/emo_im_lips_are_sealed.png
	res/drawable-hdpi/emo_im_mad.png
	res/drawable-hdpi/emo_im_money_mouth.png
	res/drawable-hdpi/emo_im_pokerface.png
	res/drawable-hdpi/emo_im_sad.png
	res/drawable-hdpi/emo_im_smirk.png
	res/drawable-hdpi/emo_im_surprised.png
	res/drawable-hdpi/emo_im_tongue_sticking_out.png
	res/drawable-hdpi/emo_im_undecided.png
	res/drawable-hdpi/emo_im_winking.png
	res/drawable-hdpi/emo_im_wtf.png
	res/drawable-hdpi/emo_im_yelling.png
	res/drawable-hdpi/ic_attach_audio_holo_light.png
	res/drawable-hdpi/ic_attach_capture_audio_holo_light.png
	res/drawable-hdpi/ic_attach_capture_picture_holo_light.png
	res/drawable-hdpi/ic_attach_capture_video_holo_light.png
	res/drawable-hdpi/ic_attach_picture_holo_light.png
	res/drawable-hdpi/ic_attach_slideshow_holo_light.png
	res/drawable-hdpi/ic_attach_video_holo_light.png
	res/drawable-hdpi/ic_attachment_universal_small.png
	res/drawable-hdpi/ic_contact_picture.png
	res/drawable-hdpi/ic_dialog_attach.png
	res/drawable-hdpi/ic_gallery_video_overlay.png
	res/drawable-hdpi/ic_launcher_contacts.png
	res/drawable-hdpi/ic_launcher_smsmms.png
	res/drawable-hdpi/ic_list_alert_sms_failed.png
	res/drawable-hdpi/ic_lock_message_sms.png
	res/drawable-hdpi/ic_maps_back.png
	res/drawable-hdpi/ic_maps_next.png
	res/drawable-hdpi/ic_menu_add_slide.png
	res/drawable-hdpi/ic_menu_add_sound.png
	res/drawable-hdpi/ic_menu_attachment.png
	res/drawable-hdpi/ic_menu_call.png
	res/drawable-hdpi/ic_menu_delete_played.png
	res/drawable-hdpi/ic_menu_done_holo_dark.png
	res/drawable-hdpi/ic_menu_duration.png
	res/drawable-hdpi/ic_menu_edit.png
	res/drawable-hdpi/ic_menu_emoticons.png
	res/drawable-hdpi/ic_menu_move_down.png
	res/drawable-hdpi/ic_menu_move_up.png
	res/drawable-hdpi/ic_menu_movie.png
	res/drawable-hdpi/ic_menu_msg_compose_holo_dark.png
	res/drawable-hdpi/ic_menu_picture.png
	res/drawable-hdpi/ic_menu_remove_picture.png
	res/drawable-hdpi/ic_menu_remove_sound.png
	res/drawable-hdpi/ic_menu_remove_text.png
	res/drawable-hdpi/ic_menu_remove_video.png
	res/drawable-hdpi/ic_menu_search_holo_dark.png
	res/drawable-hdpi/ic_menu_trash_holo_dark.png
	res/drawable-hdpi/ic_missing_thumbnail_picture.png
	res/drawable-hdpi/ic_missing_thumbnail_video.png
	res/drawable-hdpi/ic_mms_drm_protected.png
	res/drawable-hdpi/ic_mms_duration.png
	res/drawable-hdpi/ic_mms_layout.png
	res/drawable-hdpi/ic_mms_music.png
	res/drawable-hdpi/ic_mms_text_bottom.png
	res/drawable-hdpi/ic_mms_text_top.png
	res/drawable-hdpi/ic_send_holo_light.png
	res/drawable-hdpi/ic_sms_mms_delivered.png
	res/drawable-hdpi/ic_sms_mms_details.png
	res/drawable-hdpi/ic_sms_mms_not_delivered.png
	res/drawable-hdpi/ic_sms_mms_pending.png
	res/drawable-hdpi/list_pressed_holo_light.9.png
	res/drawable-hdpi/list_selected_holo_light.9.png
	res/drawable-hdpi/list_selector_background_selected.9.png
	res/drawable-hdpi/mms_play_btn.png
	res/drawable-hdpi/movie.png
	res/drawable-hdpi/msg_bubble_left.png
	res/drawable-hdpi/msg_bubble_right.png
	res/drawable-hdpi/stat_notify_mms.png
	res/drawable-hdpi/stat_notify_sms.png
	res/drawable-hdpi/stat_notify_sms_failed.png
	res/drawable-hdpi/stat_sys_no_sim.png
	res/drawable/attachment_selector.xml
	res/drawable/conversation_item_background_read.xml
	res/drawable/conversation_item_background_unread.xml
	res/drawable/listitem_background.xml
	res/layout-finger/recipient_filter_item.xml
	res/layout/audio_attachment_view.xml
	res/layout/compose_message_activity.xml
	res/layout/confirm_rate_limit_activity.xml
	res/layout/conversation_list_actionbar.xml
	res/layout/conversation_list_item.xml
	res/layout/conversation_list_multi_select_actionbar.xml
	res/layout/conversation_list_screen.xml
	res/layout/delete_thread_dialog_view.xml
	res/layout/delivery_report_activity.xml
	res/layout/delivery_report_header.xml
	res/layout/delivery_report_list_item.xml
	res/layout/edit_slide_activity.xml
	res/layout/edit_slide_duration.xml
	res/layout/editor_custom_action_bar.xml
	res/layout/icon_list_item.xml
	res/layout/image_attachment_view.xml
	res/layout/message_list_item_recv.xml
	res/layout/message_list_item_send.xml
	res/layout/mms_downloading_view.xml
	res/layout/mms_layout_view.xml
	res/layout/number_picker_dialog.xml
	res/layout/playing_audio_info.xml
	res/layout/recipients_editor.xml
	res/layout/search_activity.xml
	res/layout/search_item.xml
	res/layout/sim_list.xml
	res/layout/slideshow.xml
	res/layout/slideshow_attachment_view.xml
	res/layout/slideshow_edit_item.xml
	res/layout/smiley_menu_item.xml
	res/layout/template_editor.xml
	res/layout/templates_list.xml
	res/layout/video_attachment_view.xml
	res/menu/conversation_list_menu.xml
	res/menu/conversation_multi_select_menu.xml
	res/menu/template_list_menu.xml
	res/menu/templates_list_context_menu.xml
	res/mipmap-hdpi/ic_launcher_smsmms.png
	res/mipmap-mdpi/ic_launcher_smsmms.png
	res/mipmap-xhdpi/ic_launcher_smsmms.png
	res/values-af/arrays.xml
	res/values-af/strings.xml
	res/values-am/arrays.xml
	res/values-am/strings.xml
	res/values-ar/arrays.xml
	res/values-ar/strings.xml
	res/values-bg/arrays.xml
	res/values-bg/strings.xml
	res/values-ca/arrays.xml
	res/values-ca/strings.xml
	res/values-cs/arrays.xml
	res/values-cs/strings.xml
	res/values-da/arrays.xml
	res/values-da/strings.xml
	res/values-de/arrays.xml
	res/values-de/strings.xml
	res/values-el/arrays.xml
	res/values-el/strings.xml
	res/values-en-rGB/arrays.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/arrays.xml
	res/values-es-rUS/strings.xml
	res/values-es/arrays.xml
	res/values-es/strings.xml
	res/values-fa/arrays.xml
	res/values-fa/strings.xml
	res/values-fi/arrays.xml
	res/values-fi/strings.xml
	res/values-fr/arrays.xml
	res/values-fr/strings.xml
	res/values-hi/arrays.xml
	res/values-hi/strings.xml
	res/values-hr/arrays.xml
	res/values-hr/strings.xml
	res/values-hu/arrays.xml
	res/values-hu/strings.xml
	res/values-in/arrays.xml
	res/values-in/strings.xml
	res/values-it/arrays.xml
	res/values-it/strings.xml
	res/values-iw/arrays.xml
	res/values-iw/strings.xml
	res/values-ja/arrays.xml
	res/values-ja/strings.xml
	res/values-ko/arrays.xml
	res/values-ko/strings.xml
	res/values-lt/arrays.xml
	res/values-lt/strings.xml
	res/values-lv/arrays.xml
	res/values-lv/strings.xml
	res/values-ms/arrays.xml
	res/values-ms/strings.xml
	res/values-nb/arrays.xml
	res/values-nb/strings.xml
	res/values-nl/arrays.xml
	res/values-nl/strings.xml
	res/values-pl/arrays.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/arrays.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/arrays.xml
	res/values-pt/strings.xml
	res/values-rm/arrays.xml
	res/values-rm/strings.xml
	res/values-ro/arrays.xml
	res/values-ro/strings.xml
	res/values-ru/arrays.xml
	res/values-ru/strings.xml
	res/values-sk/arrays.xml
	res/values-sk/strings.xml
	res/values-sl/arrays.xml
	res/values-sl/strings.xml
	res/values-sr/arrays.xml
	res/values-sr/strings.xml
	res/values-sv/arrays.xml
	res/values-sv/strings.xml
	res/values-sw/arrays.xml
	res/values-sw/strings.xml
	res/values-th/arrays.xml
	res/values-th/strings.xml
	res/values-tl/arrays.xml
	res/values-tl/strings.xml
	res/values-tr/arrays.xml
	res/values-tr/strings.xml
	res/values-uk/arrays.xml
	res/values-uk/strings.xml
	res/values-vi/arrays.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/arrays.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/arrays.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/arrays.xml
	res/values-zu/strings.xml
	res/values/arrays.xml
	res/values/colors.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	res/xml/mms_config.xml
	res/xml/preferences.xml
	res/xml/searchable.xml
delate all for rebase
rebase