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