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

* commit '12d4b3cb96dd7ceb9e2f742898fc6bcc263a8011':
  Update VIBRATE_ON to a supported value when upgrading from GB.