Revert "Cleanup: Use framework-provided method."

This reverts commit 2cb11d6d5544bdb74dde7a5f61bc2c2aa469a7ca.

Revert "Fix a number of issues with T9 dialer."

This reverts commit 6c88a2e48b181cd82eeffd55fe64255c90095ae6.

Revert "Improve T9 name normalization code"

This reverts commit be0a36353c645a2a3654cf72d614eb16237352ce.

Revert "Show formatted number in T9 result list."

This reverts commit 9aad5b396f0293bd285626f1e2264f162c1ed78f.

Revert "Fix NullPointerException on locale change."

This reverts commit 3a1e496e7fc103308bf8e1ba95f465e4abe4b042.

Revert "If there's a contacts DB change while the dialpad is open, reload the"

This reverts commit 1ae05a3bdb57e90ebffc184fd7c246d97bf3b8f4.

Revert "Dialer - T9 / Landscape Merges"

This reverts commit 54ef7b9e583c7174d41765b40b05e1e7a4ca1c2b.

Conflicts:
	res/drawable-iw-xhdpi/dial_num_4_wht.png
	res/drawable-ko-xhdpi/dial_num_2_wht.png
	res/values-bg/strings.xml
	res/values-cs/strings.xml
	res/values-de/strings.xml
	res/values-fi/strings.xml
	res/values-hu/strings.xml
	res/values-iw/strings.xml
	res/values-ko/strings.xml
	res/values-pl/strings.xml
	res/values-pt/strings.xml
	res/values-ru/strings.xml
	src/com/android/contacts/dialpad/DialpadFragment.java

Change-Id: I901fb655c903cf05de1146881ade88bd58629082
Revert "Add Call statistics to Contacts (Phone)"

This reverts commit 6a3a391728dc6ec87699aba1d953e223a0fe0427.

Conflicts:
	res/layout/call_stats_activity.xml
	res/layout/call_stats_list_item.xml
	res/layout/double_date_picker_dialog.xml
	res/menu/call_stats_details_options.xml
	res/values-de/strings.xml
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/contacts/calllog/CallLogAdapterHelper.java
	src/com/android/contacts/callstats/CallStatsActivity.java
	src/com/android/contacts/callstats/CallStatsAdapter.java
	src/com/android/contacts/callstats/CallStatsDetailActivity.java
	src/com/android/contacts/callstats/CallStatsDetailHelper.java
	src/com/android/contacts/callstats/CallStatsDetails.java
	src/com/android/contacts/callstats/CallStatsQueryHandler.java
	src/com/android/contacts/callstats/DoubleDatePickerDialog.java

Change-Id: I664d9bc726464f40931570592c46b025e9a08769

Conflicts:
	src/com/android/contacts/CallDetailActivity.java
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

Conflicts:
	res/values-es/strings.xml
	res/values-land/styles.xml
	res/values-sw580dp/styles.xml
	res/values-zh-rCN/strings.xml