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

* commit '15db00eb94f0a6a1969152f83addd079c4e9b3f2':
  DEFAULT_VIBRATE must always use the default vibe pattern