diff options
Diffstat (limited to 'WebCore/bridge/jni/v8/JavaInstanceV8.cpp')
| -rw-r--r-- | WebCore/bridge/jni/v8/JavaInstanceV8.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/bridge/jni/v8/JavaInstanceV8.cpp b/WebCore/bridge/jni/v8/JavaInstanceV8.cpp index dd4750f..980bf91 100644 --- a/WebCore/bridge/jni/v8/JavaInstanceV8.cpp +++ b/WebCore/bridge/jni/v8/JavaInstanceV8.cpp @@ -32,11 +32,14 @@ #include "JavaClassV8.h" #include <assert.h> +<<<<<<< HEAD // ANDROID #define LOG_TAG "v8binding" #include <utils/Log.h> // END ANDROID +======= +>>>>>>> webkit.org at r63173 using namespace JSC::Bindings; |