tree 49ce089d9bb8560f05b6b08419e87bb229b426a2
parent 3f6ee1a180268ca2e30723ce2c45b81c2e671abb
parent 30348b0de11b6c6cba43dfc7960e4d2084af6d8b
author Mike Lockwood <lockwood@android.com> 1259178858 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259178858 -0800

am 30348b0d: Merge change I086d681f into eclair-mr2

Merge commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b' into eclair-mr2-plus-aosp

* commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b':
  Remove HardwareService and move vibrator support to VibratorService.