Merge android-4.4_r1

Conflicts:
	AndroidManifest.xml
	res/values-ar/strings.xml
	res/values/colors.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/preferences.xml
	src/com/android/mms/MmsApp.java
	src/com/android/mms/data/Conversation.java
	src/com/android/mms/transaction/MessagingNotification.java
	src/com/android/mms/transaction/MmsSystemEventReceiver.java
	src/com/android/mms/transaction/SmsReceiverService.java
	src/com/android/mms/transaction/TransactionService.java
	src/com/android/mms/ui/ComposeMessageActivity.java
	src/com/android/mms/ui/ConversationList.java
	src/com/android/mms/ui/ConversationListItem.java
	src/com/android/mms/ui/MessageListItem.java
	src/com/android/mms/ui/MessagingPreferenceActivity.java
	src/com/android/mms/ui/SlideshowActivity.java
	src/com/android/mms/ui/UriImage.java
Revert "Mms: Generic Blacklist support (3 of 5)"

This reverts commit 12daa67df30420c03165e7497fad1e2c7f326c17.

Conflicts:
	res/values/slim_strings.xml
	src/com/android/mms/ui/MessagingPreferenceActivity.java
Cleanup
Revert "Mms: Enforce thumbnail rotation when needed"

This reverts commit 29cca79deb66a98d474c97355b2eb2a9affdc17a.

Conflicts:
	src/com/android/mms/ui/UriImage.java
Revert "Mms auto-retrieval (3/3): mms app"

This reverts commit 2c2ec3c8db819938b93615fe6cd6a7bd51237881.

Conflicts:
	src/com/android/mms/ui/MessagingPreferenceActivity.java
More cleanup