tree 6c40caeae4f078cd9340daebf95408fcd7e472a0
parent a942dfdaf1f5004e8d58153a502f3900a912386f
parent bbcc300c87d702aede31de311f88571b0caf9113
author Amith Yamasani <yamasani@google.com> 1322862256 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322862256 -0800

am bbcc300c: Merge "Set the same vibrate settings for ringer and notifications." into ics-mr1

* commit 'bbcc300c87d702aede31de311f88571b0caf9113':
  Set the same vibrate settings for ringer and notifications.