tree 485b152b97bf8321fdd223f35587bb4294672be8
parent 76cc3dfcfffd6c0b402c9f9249a4144059534fb8
parent ee5de0ffffbde8b7be7c8727422573dbca24e630
author Mike Cleron <mcleron@google.com> 1323742666 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323742666 -0800

am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1

* commit '840201d6e2d7d53e42a31ffeb2ef454982882d12':
  Update VIBRATE_ON to a supported value when upgrading from GB.