[2/2] Added network meter to statusbar

Conflicts:
	core/java/android/provider/Settings.java