Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Re-add link to DeviceParts.

Change-Id: Ib595b81a11e19f8526e532400e57f5771db09499

Conflicts:
	src/com/android/settings/cyanogenmod/MoreDeviceSettings.java
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Settings: PT-BR update translations

Change-Id: I6373de269c3cb2124b7264f7deab1a0c3136378f
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2