Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp * commit 'e4764521353e898554931a557460fc49209fb0a9': new SensorService
Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp * commit 'e4764521353e898554931a557460fc49209fb0a9': new SensorService