Merge commit 'f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f' into eclair-plus-aosp * commit 'f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f': PowerManagerService: Use 5 cm threshold for the proximity sensor.
Merge commit 'f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f' into eclair-plus-aosp * commit 'f73f91c5b1f66bbe4b3ca59b743a62ad5a65853f': PowerManagerService: Use 5 cm threshold for the proximity sensor.