Merge branch 'donut' of git://github.com/Wysie/android_packages_apps_Contacts into HEAD

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/contacts_preferences.xml
	src/com/android/contacts/ContactsPreferences.java
	src/com/android/contacts/RecentCallsListActivity.java
	src/com/android/contacts/TwelveKeyDialer.java
	src/com/android/contacts/ViewContactActivity.java