| commit | 2e56995e9e19f18958167a28911120f31b096756 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Nov 17 21:04:37 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 17 21:04:37 2011 -0800 |
| tree | 88edf9af029a9cc246b91c13711f2a0c5439912c | |
| parent | 65035d2a72fd8c847aa9c78c0e97058535ec18a5 [diff] | |
| parent | da0e7b0c7a0bb1f9f972c3ed042b8cd752031046 [diff] |
am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1 * commit 'da0e7b0c7a0bb1f9f972c3ed042b8cd752031046': Tie screen saver to the screen off timeout.