Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	res/layout/call_detail.xml
	res/layout/call_log_list_item.xml
	res/layout/confirm_add_detail_activity.xml
	res/layout/contact_tile_phone_starred.xml
	res/layout/contact_tile_starred.xml
	res/layout/contact_tile_starred_quick_contact.xml
	res/layout/dialpad_fragment.xml
	res/layout/quickcontact_photo_container.xml
	res/menu/call_details_options.xml
	res/values-cs/strings.xml
	res/values-el/strings.xml
	res/values-hu/strings.xml
	res/values-pt/strings.xml
	res/values/colors.xml
	res/values/styles.xml
	src/com/android/contacts/CallDetailActivity.java
	src/com/android/contacts/calllog/ContactInfoHelper.java
	src/com/android/contacts/dialpad/DialpadFragment.java
	src/com/android/contacts/list/ContactListItemView.java

Change-Id: Ia53c884f4b64980f440e734ea93bed46eeda0180