tree 1610c5be077648ddabcaaecc9b94feaf18eb3864
parent 5913f40618494a361b4cc0c79aebdd2f0a9170da
parent 267874622e43a99474defbe4d07ace78e76bb690
author Justin Koh <justinkoh@google.com> 1412015043 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412015044 +0000

Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev