am 5d167767: am 53f1b151: Merge "adjust haptic feedback test for device...
am 5d167767: am 53f1b151: Merge "adjust haptic feedback test for device without vibrator" into jb-mr1-dev
* commit '5d167767':
adjust haptic feedback test for device without vibrator