fix

Change-Id: Ic8afa643abc5a6582dc27d04febc4d7768b1b345

Conflicts:
	src/com/android/settings/slim/StatusBarNetSpeed.java