Add Volume-Rocker configuration option
Merge remote-tracking branch 'pabx/jb42' into jellybean

Conflicts:
	src/com/android/settings/SoundSettings.java