am 3f69fad9: (-s ours) am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1

* commit '3f69fad9e958f867ceaab9c370b97959e3337c50':
  Update VIBRATE_ON to a supported value when upgrading from GB.