OSDN Git Service

am 5d0e02e6: Stop the loading after WAKELOCK_TIMEOUT (5min) when the Browser is in...
authorGrace Kloba <klobag@google.com>
Wed, 7 Oct 2009 18:52:10 +0000 (11:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2009 18:52:10 +0000 (11:52 -0700)
Merge commit '5d0e02e646e46b14289168f75c2a8f6ed43cac54' into eclair-mr2-plus-aosp

* commit '5d0e02e646e46b14289168f75c2a8f6ed43cac54':
  Stop the loading after WAKELOCK_TIMEOUT (5min) when


Trivial merge