2 files changed, 14 insertions, 1 deletions
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index cf9f561..644b504 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009, The Android Open Source Project
+ * Copyright 2009, 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -81,7 +81,10 @@ class NPObject;
 
 namespace WebCore {
 
+<<<<<<< HEAD
 class FrameView;
+=======
+>>>>>>> webkit.org at r54127
 class Widget;
 
 // An interface to the embedding layer, which has the ability to answer
@@ -105,6 +108,7 @@ public:
     static bool cookiesEnabled();
     // Plugin
     static NPObject* pluginScriptableObject(Widget*);
+<<<<<<< HEAD
     // Popups
     static bool popupsAllowed(NPP);
 
@@ -127,6 +131,8 @@ public:
 
     // Whether the WebView is paused.
     static bool isWebViewPaused();
+=======
+>>>>>>> webkit.org at r54127
 };
 
 }
diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp
index d2fcebb..1ff87c3 100644
--- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp
+++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp
@@ -30,14 +30,21 @@
 
 namespace WebCore {
 
+<<<<<<< HEAD
 // TODO (benm): eventTime is new and needs to be upstream
 PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state, long eventTime)
+=======
+PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state)
+>>>>>>> webkit.org at r54127
     : m_type(type)
     , m_ctrlKey(false)
     , m_altKey(false)
     , m_shiftKey(false)
     , m_metaKey(false)
+<<<<<<< HEAD
     , m_eventTime(eventTime)
+=======
+>>>>>>> webkit.org at r54127
 {
     m_touchPoints.append(PlatformTouchPoint(windowPos, state));
 }