commit 926780b023a09d37e8dcf1fabf6fa990f042f06d
author Bart Sears <bsears@google.com> Wed Feb 10 09:13:48 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 10 09:13:48 2010 -0800
tree 9d3feb88ec4bd2e5f9b58dd8557cc42b65a35451
parent 859f455645bc49e32330108b1ea9f85ffb80a2cd
parent 614f8450a7f511e5ea279cfd870b1a8fa62ec5eb

Merge "DO NOT MERGE" into eclair

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