diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-03-12 15:40:56 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2012-03-12 15:40:56 -0400 |
| commit | 146f4231e665a454284a465ff66379b9277f1fc0 (patch) | |
| tree | 229239bf8a3a2587eb42dc8c6eb0f89bb655bfc0 /Source/WebKit | |
| parent | 668a73488d6938004d25b6c155573e97b6600182 (diff) | |
| parent | f6d491730d3fe389bd2f027abe9f5676dd4376aa (diff) | |
| download | external_webkit-146f4231e665a454284a465ff66379b9277f1fc0.zip external_webkit-146f4231e665a454284a465ff66379b9277f1fc0.tar.gz external_webkit-146f4231e665a454284a465ff66379b9277f1fc0.tar.bz2 | |
resolved conflicts for merge of f6d49173 to master
Change-Id: I5c3e6fe524ae5742420c5a6e092d92840e2754f0
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h index ff55c00..6f9bb13 100644 --- a/Source/WebKit/android/jni/WebViewCore.h +++ b/Source/WebKit/android/jni/WebViewCore.h @@ -49,6 +49,7 @@ #include <jni.h> #include <androidfw/KeycodeLabels.h> #include <ui/PixelFormat.h> +#include <utils/threads.h> namespace WebCore { class Color; |