tree fb518edbfa5c463ce62e58f8a78850ba02f81cc6
parent 47a74f375ad853055fa8e17a8c64a0b9437490d9
parent 69d13491eaf0d90b2a1740373306a12bc6238bd4
author Daniel Sandler <dsandler@android.com> 1353455716 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353455716 -0800

am 69d13491: am 8fef4a82: am 15db00eb: Merge "DEFAULT_VIBRATE must always use the default vibe pattern" into jb-mr1.1-dev

* commit '69d13491eaf0d90b2a1740373306a12bc6238bd4':
  DEFAULT_VIBRATE must always use the default vibe pattern