am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent...
am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
* commit '18936d7d':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.