Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	res/xml/network_setting.xml
	src/com/android/phone/Ringer.java