| commit | 608601924651531210ad3c6179d02c471f42dddf | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon Jun 18 10:33:05 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 18 10:33:05 2012 -0700 |
| tree | ec1b7516c360292123b2140c0d19a6bc2c68fa11 | |
| parent | 772ddc0cf28625964435edc5e86048e353c425fa [diff] | |
| parent | d8bbf96a84cba7c31fa1535fe2467520f2aa0198 [diff] |
am d8bbf96a: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev * commit 'd8bbf96a84cba7c31fa1535fe2467520f2aa0198': Fix issue #6664140: Time to lock should work even Stay awake...