| commit | d0861c8992356296115dc203feb50ce8a8794bd9 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Jan 17 17:03:51 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 17 17:03:51 2011 -0800 |
| tree | 204d404270a5782662af45c5dbb10533218f88f1 | |
| parent | 9ef6ec98769b6d9a1d7aaa68dde7d4cf66285998 [diff] | |
| parent | 3d7a9707a58bb043147f30dc81c61deeeffeeef7 [diff] |
am 3d7a9707: Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb * commit '3d7a9707a58bb043147f30dc81c61deeeffeeef7': Fix 3210299: Extend lock screen wake timeout to 10s