d2att: fix description/fingerprint (they were transposed)

Change-Id: I08ecb81ff5488ca15ac1fc6c45187a25f5868a51
Merge "d2att: fix description/fingerprint (they were transposed)" into cm-10.1
d2att: Switch to SamsungQualcommUiccRIL

Change-Id: I2c523fe00bd4d6d14eb213f99093813ae6472b36
Merge remote-tracking branch 'CM/cm-10.1' into jellybean

Conflicts:
	cm.mk
	system.prop