tree c147eb571731b7665d3ebe4cf33a2d9b42b3bc86
parent 4e3cdf854441b84c15fd9f127127b6d116834c51
parent d20ea369b26cb40ee6122dd819ce9ef947489146
author Android (Google) Code Review <android-gerrit@google.com> 1253025133 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 1253025133 -0400

Merge change 25012 into eclair

* changes:
  PowerManagerService: Use 5 cm threshold for the proximity sensor.