resolved conflicts for merge of 918e1d78 to eclair

diff --cc src/com/android/browser/BrowserActivity.java
index 5e63c39,b58af66..f5d71d6
--- 1/src/com/android/browser/BrowserActivity.java
--- 2/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@@ -1970,9 -2543,18 +1970,19 @@@ public class BrowserActivity extends Ac
                          finish();
                          return;
                      }
 -                    // call pauseWebView() now, we won't be able to call it in
 -                    // onPause() as the WebView won't be valid. Temporarily
 -                    // change mActivityInPause to be true as pauseWebView() will
 -                    // do nothing if mActivityInPause is false.
 +                    // call pauseWebViewTimers() now, we won't be able to call
 +                    // it in onPause() as the WebView won't be valid.
++                    // Temporarily change mActivityInPause to be true as
++                    // pauseWebViewTimers() will do nothing if mActivityInPause
++                    // is false.
+                     boolean savedState = mActivityInPause;
+                     if (savedState) {
 -                        Log.e(LOGTAG, "BrowserActivity is already paused " +
 -                                "while handing goBackOnePageOrQuit.");
++                        Log.e(LOGTAG, "BrowserActivity is already paused "
++                                + "while handing goBackOnePageOrQuit.");
+                     }
+                     mActivityInPause = true;
 -                    pauseWebView();
 +                    pauseWebViewTimers();
+                     mActivityInPause = savedState;
                      removeTabFromContentView(current);
                      mTabControl.removeTab(current);
                  }