rebase derp
[4/4] Telephony: Smart Phone Call

Put on your ear, and this will automatically call current number in message or dialer

Change-Id: Ib7ae9b73af82b809aa782baf0b90e0c6cd4fc04e
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java

Conflicts:
	res/values/custom_strings.xml
	src/com/android/phone/CallFeaturesSetting.java