auto-merger: merge in from slim/kk4.4

Conflicts:
	res/values-ru/strings.xml
	src/com/android/incallui/CallCardFragment.java
	src/com/android/incallui/CallCardPresenter.java
	src/com/android/incallui/CallList.java