Merge commit '48adf5730d80b2e831d8fcb6818bd921ef0e5fab' into kk-4.4

Conflicts:
	src/com/android/incallui/InCallActivity.java