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