| commit | 0d1aa05fa6f9dec2b77836f2ca91dce7af9c14ce | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Jan 17 23:31:21 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 17 23:31:21 2011 -0800 |
| tree | f88547dbd6d8b547bdd74d6616f447b03680882e | |
| parent | b61cdf0231bf3662c7dc79f3859bb8c5935f84c6 [diff] | |
| parent | d0861c8992356296115dc203feb50ce8a8794bd9 [diff] |
am d0861c89: am 3d7a9707: Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb * commit 'd0861c8992356296115dc203feb50ce8a8794bd9': Fix 3210299: Extend lock screen wake timeout to 10s