commit 308dfd2dfccc78a73ababf1f256b20e9cd35875e
author Derek Sollenberger <djsollen@google.com> Tue Jan 22 16:23:01 2013 -0500
committer Derek Sollenberger <djsollen@google.com> Tue Jan 22 16:23:01 2013 -0500
tree 13c7110e82366af1afb39b0cc1558f708560d184
parent 31cbb6d924e6d854ced4f9923c1edc8dc90e4fbc

fix for broken merge resolution in Ia2c5

Change-Id: Id65f22a7e972511047feb06d3d382819e63c9d7d

Source/WebKit/android/jni/ViewStateSerializer.cpp

diff --git a/Source/WebKit/android/jni/ViewStateSerializer.cpp b/Source/WebKit/android/jni/ViewStateSerializer.cpp
index ff7d728..97c15d0 100644
--- a/Source/WebKit/android/jni/ViewStateSerializer.cpp
+++ b/Source/WebKit/android/jni/ViewStateSerializer.cpp
@@ -40,6 +40,7 @@
 #include "LayerContent.h"
 #include "PictureLayerContent.h"
 #include "ScrollableLayerAndroid.h"
+#include "SkData.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
 #include "SkPicture.h"