Build Version
Settings: Volume panel timeout [2/2]

Conflicts:
	res/values/probam_attrs.xml
	res/values/probam_strings.xml
	res/xml/sound_settings.xml
	src/com/android/settings/SoundSettings.java
	src/com/android/settings/widget/SeekBarPreferenceCham.java
Delete remaining .orig file
Port back Notification drawer brightness slider 2/2

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/power_widget_settings.xml
	src/com/android/settings/cyanogenmod/PowerWidget.java