commit | 019837205edc48f97e7485665c6070be7519a0c6 | [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 | 5541ff6c50c77ceaec3600826032470fc9cf0584 | |
parent | 32f4fe562649f00837453cffd7930fe82d4d789c [diff] | |
parent | ba7232c6b33fa32c62e230e1e3eb94023c2e3836 [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.