am 480b2e44: Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0

* commit '480b2e440646e4859ebdd88b82441b4bd9a61651':
  Use vibrate icon in volume settings when appropriate.