| commit | 920b8e4a331c337e1c7aefa32240dddde3016a02 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Jan 17 15:53:42 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 17 15:53:42 2011 -0800 |
| tree | ed62e9afbb54ca173c31ef9463147a2f8c66a60a | |
| parent | 74548a5340e9836f3a59ef1d9890326a5ca38501 [diff] | |
| parent | 5b6e1d61e6e52c9a8b476994e6a49768fa5b8401 [diff] |
Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb