From: Grace Kloba <klobag@google.com>
Date: Fri, 2 Apr 2010 23:14:15 +0000 (-0700)
Subject: am b721be96: Merge "When we stopUpdating(), we should cancel the outstanding timer... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4f87c989;p=android-x86%2Fexternal-webkit.git

am b721be96: Merge "When we stopUpdating(), we should cancel the outstanding timer." into froyo

Merge commit 'b721be96061253a7a8e35313bb5ee794d03d9af8' into froyo-plus-aosp

* commit 'b721be96061253a7a8e35313bb5ee794d03d9af8':
  When we stopUpdating(), we should cancel the outstanding
---

4f87c989da57303c3d370bc73d25b51be5f7073d