am 2e56995e: am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1

* commit '2e56995e9e19f18958167a28911120f31b096756':
  Tie screen saver to the screen off timeout.
This commit is contained in:
Daniel Sandler 2011-11-18 14:47:58 -08:00 committed by Android Git Automerger
commit 1ab29ba0ef

Diff Content Not Available