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.