am 5cf8d00f: am f73f91c5: Merge change 25012 into eclair

Merge commit '5cf8d00f0c1f511a769c171843dfd3427312b99a'

* commit '5cf8d00f0c1f511a769c171843dfd3427312b99a':
  PowerManagerService: Use 5 cm threshold for the proximity sensor.