tree 69eaff167fbdab38ae9c01bbcd5e79ee4cb13042
parent e784ae8e6a0eab3d29afc9b19f65714e7b268b97
parent 924c0690f40ab103465d32accb3b04be6733deef
author Daniel Sandler <dsandler@android.com> 1353429816 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353429816 -0800

am 924c0690: am 272247aa: am aaec7269: (-s ours) Notification vibration improvements: [DO NOT MERGE]

* commit '924c0690f40ab103465d32accb3b04be6733deef':
  Notification vibration improvements: [DO NOT MERGE]