diff options
| author | Ben Murdoch <benm@google.com> | 2009-12-10 13:33:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 13:33:07 -0800 |
| commit | 2d4c25b54e4a39cb4cdd7c7cb24f26293338b18d (patch) | |
| tree | f6a2aa1541483a7ecc5cce20b3f65da582c83784 | |
| parent | e0a46678227ece62a8c46256b41bef57c99d1265 (diff) | |
| parent | f5cee3f030cb360beccf7cb4e9c71e791076b891 (diff) | |
| download | external_webkit-2d4c25b54e4a39cb4cdd7c7cb24f26293338b18d.zip external_webkit-2d4c25b54e4a39cb4cdd7c7cb24f26293338b18d.tar.gz external_webkit-2d4c25b54e4a39cb4cdd7c7cb24f26293338b18d.tar.bz2 | |
am f5cee3f0: am 168aa9a1: Merge change I747854ee into eclair-mr2
Merge commit 'f5cee3f030cb360beccf7cb4e9c71e791076b891'
* commit 'f5cee3f030cb360beccf7cb4e9c71e791076b891':
Remove an accidentally added include.
| -rw-r--r-- | WebKit/android/jni/WebCoreJniOnLoad.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp index b7c2fed..2450b78 100644 --- a/WebKit/android/jni/WebCoreJniOnLoad.cpp +++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp @@ -56,7 +56,6 @@ #include "TextEncoding.h" #include "WebCoreViewBridge.h" #include "WebFrameView.h" -#include "WebHistory.h" #include "WebViewCore.h" #include "SkBitmap.h" |