Merge "samsung gsm family: set ro.telephony.default_network=9" into cm-10.1
Conflicts:
	system.prop