| commit | ec7131ffe3e5684eff4c19f577b324d0e5a61d33 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Oct 05 16:35:07 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 05 16:35:08 2012 -0700 |
| tree | 21336fceaffd74fa21f1601848e4db91ae6b4307 | |
| parent | 2874a54068af1e7de3c1c046cc0061412daafaf8 [diff] | |
| parent | 6aaf29589b5fbe24721740e71b272c4a830b69e7 [diff] |
Merge "Lock the screen while dreaming after the appropriate timeout." into jb-mr1-dev