volume rocker wake (2/2)
volume rocker music control

Conflicts:
	res/values/ras_strings.xml
	res/xml/volume_rocker_settings.xml
	src/com/android/settings/rascarlo/VolumeRocker.java