commit | ba7232c6b33fa32c62e230e1e3eb94023c2e3836 | [log] [tgz] |
---|---|---|
author | Daniel Sandler <dsandler@android.com> | Thu Nov 17 21:02:40 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 17 21:02:40 2011 -0800 |
tree | 5541ff6c50c77ceaec3600826032470fc9cf0584 | |
parent | 7be909033d5741a9b758c5b99a526d0cd80d3f48 [diff] | |
parent | 9ae6c9c4d64b915a911aa9fc8caa23bd0e489920 [diff] |
Merge "Tie screen saver to the screen off timeout." into ics-mr1