commit 789b11c715af48a0379b8b1f90d7a829ac6a8145
author Bart Sears <bsears@google.com> Wed Feb 10 09:18:37 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 10 09:18:37 2010 -0800
tree 09d1891b14df72224045ee32dc1df93ed8f151df
parent e524ff534e1aabc45819e978c26bf61d9b71f444
parent 926780b023a09d37e8dcf1fabf6fa990f042f06d

am 926780b0: Merge "DO NOT MERGE" into eclair

Merge commit '926780b023a09d37e8dcf1fabf6fa990f042f06d' into eclair-plus-aosp

* commit '926780b023a09d37e8dcf1fabf6fa990f042f06d':
  DO NOT MERGE

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index ecee0d0..c5c14d3 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -434,7 +434,7 @@
     private boolean mWrapContent;
 
     // whether support multi-touch
-    private static boolean mSupportMultiTouch;
+    private boolean mSupportMultiTouch;
     // use the framework's ScaleGestureDetector to handle multi-touch
     private ScaleGestureDetector mScaleDetector;
     // minimum scale change during multi-touch zoom