Status Network Activity (2/2)

Conflicts:
	res/xml/status_bar_settings.xml
	src/com/android/settings/rascarlo/StatusBarSettings.java

Change-Id: I6cc01d638de18bcbfd80449a4a506bec61b1e6c4