am 80ff42c1: Re-schedule screen saver mode when returning to normal.
am 80ff42c1: Re-schedule screen saver mode when returning to normal.

Merge commit '80ff42c1abf87a4e81cb422446412973b46a75bd' into eclair-mr2-plus-aosp

* commit '80ff42c1abf87a4e81cb422446412973b46a75bd':
  Re-schedule screen saver mode when returning to normal.

OrBin/SynClock-Android,dseuss/deskclock,dseuss/deskclock