Merge remote-tracking branch 'cm11/cm-11.0' into kk-4.4

Signed-off-by: baked <travp624@gmail.com>

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/ic_dial_action_delete.png
	res/drawable-mdpi/ic_dial_action_delete.png
	res/drawable-xhdpi/ic_dial_action_delete.png
	res/drawable-xxhdpi/ic_dial_action_delete.png
	res/layout-land/dialpad_fragment.xml
	res/layout/dialpad_key.xml
	res/values-zh-rCN/strings.xml
	res/values/colors.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/android/dialer/CallDetailActivity.java
	src/com/android/dialer/CallDetailHeader.java
	src/com/android/dialer/calllog/CallLogAdapter.java
	src/com/android/dialer/calllog/CallLogAdapterHelper.java
	src/com/android/dialer/calllog/ContactInfoHelper.java
	src/com/android/dialer/callstats/CallStatsAdapter.java
	src/com/android/dialer/callstats/CallStatsDetailActivity.java
	src/com/android/dialer/callstats/CallStatsDetailHelper.java