Merge commit '22e186898e47cf35a49e73494bf11695c854d284' into eclair-plus-aosp * commit '22e186898e47cf35a49e73494bf11695c854d284': packages/apps/Setting: Make vkey button haptics part of global haptic setting
Merge commit '22e186898e47cf35a49e73494bf11695c854d284' into eclair-plus-aosp * commit '22e186898e47cf35a49e73494bf11695c854d284': packages/apps/Setting: Make vkey button haptics part of global haptic setting