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
tree: 3267000af8296beba7786e8ea153c4b9d456f877
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml