tree 3267000af8296beba7786e8ea153c4b9d456f877
parent b9af1fbde20c98c969935a57f0ce5ac9e1bea3c8
parent 25c715879c96c1e7d1b4dbd0b0b93f50e33f5c72
author Yorke Lee <yorkelee@google.com> 1441127179 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441127179 +0000

am 25c71587: (-s ours) Merge "DO NOT MERGE Remove HapticFeedback class from PhoneCommon" into ub-contactsdialer-a-dev

* commit '25c715879c96c1e7d1b4dbd0b0b93f50e33f5c72':
  DO NOT MERGE Remove HapticFeedback class from PhoneCommon