Network Traffic

Conflicts:
	res/values/ras_arrays.xml
	res/values/ras_strings.xml
	src/com/android/settings/rascarlo/StatusBarSettings.java
add back color picker
Settings:Network Activity

Status bar activity indicators settings

Conflicts:
	res/values/purity_strings.xml
	src/com/android/settings/purity/StatusBar.java

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