samsung gsm family: set ro.telephony.default_network=9
Merge remote-tracking branch 'CM/cm-10.1' into jellybean

Conflicts:
	system.prop