What does this line here?

Change-Id: I92bc88794185a88117d9b760911c89274c2df64f
Fix new menu addition FC
Settings: Battery bar height && color (2/2)

Change-Id: Ia800146fe20e4b4bd057db2ac24537df258d6a50

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
Rearrange settings, new menu additions
move Pie Control