diff options
Diffstat (limited to 'WebCore/platform/android/FileSystemAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/FileSystemAndroid.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp index 3513958..5ab8929 100644 --- a/WebCore/platform/android/FileSystemAndroid.cpp +++ b/WebCore/platform/android/FileSystemAndroid.cpp @@ -28,8 +28,11 @@ #include "config.h" #include "FileSystem.h" +<<<<<<< HEAD #include "PlatformBridge.h" #include "StringBuilder.h" +======= +>>>>>>> webkit.org at r70209 #include "cutils/log.h" #include <dirent.h> #include <dlfcn.h> @@ -37,6 +40,7 @@ #include <fnmatch.h> #include <sys/stat.h> #include <wtf/text/CString.h> +#include <wtf/text/StringBuilder.h> namespace WebCore { |