diff options
| author | Steve Block <steveblock@google.com> | 2010-01-19 15:00:28 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-19 15:00:48 +0000 |
| commit | 23a4578154c0507a6c2a42de452b3bcec971d0ed (patch) | |
| tree | fcc8e9db51e01a45cefa674f9b366b3819f63b8e /WebKit/android | |
| parent | 6f473cc5d35ac6beed6d8c4bafdb37a0639ee08e (diff) | |
| parent | df644d06988b2a2839113b5f4fc7b8dd1717d964 (diff) | |
| download | external_webkit-23a4578154c0507a6c2a42de452b3bcec971d0ed.zip external_webkit-23a4578154c0507a6c2a42de452b3bcec971d0ed.tar.gz external_webkit-23a4578154c0507a6c2a42de452b3bcec971d0ed.tar.bz2 | |
resolved conflicts for merge of df644d06 to master
Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index a7a93d5..5dd0db5 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -103,7 +103,7 @@ #include "jni.h" #if USE(JSC) -#include "jni_instance.h" +#include "JavaInstanceJSC.h" #endif // USE(JSC) #include <JNIHelp.h> |