Merge "DO NOT MERGE" into eclair

2010-02-10 09:13:48 -08:00
parent 859f455645 614f8450a7
commit 926780b023
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -434,7 +434,7 @@ public class WebView extends AbsoluteLayout
    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