Listview Animation (2/2)
Statusbar Network Stat (2/2)

Conflicts:
	res/values/bk_strings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
Port Custom Carrier Label from mokee (2/2)

Conflicts:
	res/values/bk_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/cyanogenmod/StatusBar.java