am 43355522: am dc2a3f60: am b8933665: Merge change I3f0ded49 into eclair

Merge commit '4335552259c893dc5e8ebfd8980a36ff8547ee5d'

* commit '4335552259c893dc5e8ebfd8980a36ff8547ee5d':
  Increase light sensor delay from one to two seconds.