tree 5d899de7b721886fbee7bb9fff45914d02b0c2fe
parent 52208590123210506abd2d14124bec1f07847b1f
parent 91bd87699137a4ec9f4dc249592401005303f945
author Justin Koh <justinkoh@google.com> 1412124720 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412124720 +0000

am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev

* commit '91bd87699137a4ec9f4dc249592401005303f945':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch