fix up messagingpreferanceactivity

Conflicts:

	src/com/android/mms/ui/MessagingPreferenceActivity.java