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

Conflicts:
	src/com/android/dialer/CallDetailActivity.java