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