am 0bf5cce9: am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread

Merge commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c'

* commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c':
  Fix the notification vibration setting and add a test app that lets you recover from the busted