am dc2a3f60: am b8933665: Merge change I3f0ded49 into eclair

Merge commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6' into eclair-mr2-plus-aosp

* commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6':
  Increase light sensor delay from one to two seconds.
tree: 425f5c3e143fea8aca48ef51b89089eba7040cb5
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE