RingerVolumePreference.java: Fix alignment
Quick Unlock: Fix alignment and better code line style
Merge remote-tracking branch 'pa/jellybean' into jellybean