| commit | 4fb2341ca6dc479444c3caf48bc88e01c9db588d | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Wed Oct 07 11:52:10 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 11:52:10 2009 -0700 |
| tree | b61e48a9c6fd730d08dee26820f6ea3ba5180428 | |
| parent | b0b79692931562a1c9a260855e206bfed4b4243b [diff] | |
| parent | 5d0e02e646e46b14289168f75c2a8f6ed43cac54 [diff] |
am 5d0e02e6: Stop the loading after WAKELOCK_TIMEOUT (5min) when the Browser is in the background. So we won\'t continue to burn the battery if there is some mis-behaved JavaScript running. Merge commit '5d0e02e646e46b14289168f75c2a8f6ed43cac54' into eclair-mr2-plus-aosp * commit '5d0e02e646e46b14289168f75c2a8f6ed43cac54': Stop the loading after WAKELOCK_TIMEOUT (5min) when