am cb6f29eb: am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread

Merge commit 'cb6f29ebc6a8cde6ed600d233e23b962d06ea43f'

* commit 'cb6f29ebc6a8cde6ed600d233e23b962d06ea43f':
  Allow touch events when clickable *or* longClickable

core/java/android/webkit/WebView.java

@@ -4948,7 +4948,7 @@ public class WebView extends AbsoluteLayout
 
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
-        if (mNativeClass == 0 || !isClickable() || !isLongClickable()) {
+        if (mNativeClass == 0 || (!isClickable() && !isLongClickable())) {
             return false;
         }