Merge change 25012 into eclair

* changes:
  PowerManagerService: Use 5 cm threshold for the proximity sensor.
tree: 50ef4d7f5da62be60d0748dba6ed6713c61d6443
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE