Merge "Tie screen saver to the screen off timeout." into ics-mr1

This commit is contained in:
Daniel Sandler 2011-11-17 21:02:40 -08:00 committed by Android (Google) Code Review
commit ba7232c6b3

Diff Content Not Available