Call equals() comparing different types

See: http://review.cyanogenmod.org/#/c/28642/
https://android-review.googlesource.com/#/c/45430/

Change-Id: I1ef553e5d64cb36e96fdb28e7f437efb9edd5c6d
Move Multi Sim settings above other settings

Change-Id: Id7ce844529299fa1e42bde5d433bc0ecd1c68527
Update MobileNetworks Icon

Match to QS tile icon

Change-Id: I416f0c9da40973532f79dc2ae7a46a274591a948
Merge "Call equals() comparing different types" into cm-11.0
Merge "Update MobileNetworks Icon" into cm-11.0
Settings : Add contributors word cloud

Change-Id: I43dc37e7d164ae0a641e39bdcfbdaebad62c85fe
Merge "Settings : Add contributors word cloud" into cm-11.0
NFC polling mode (2/3)

Change-Id: Ic46ede10fa91f02ca73daa12aa60098c8a52ceef

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/WirelessSettings.java