diff options
| author | Chris Craik <ccraik@google.com> | 2011-11-17 11:42:20 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2011-11-17 11:42:20 -0800 |
| commit | ecc9a729169b40aa92aafc472d01470e9f99aadb (patch) | |
| tree | 5dae377a54d8ff8c2c192046f207e155c7826ae3 /Source/WebCore/Android.mk | |
| parent | 715eeddc8ef29691515e9ec28a5e33dd11238e87 (diff) | |
| parent | 4eaaa2a02fe00ed1915d8e8005914caf5bc11c80 (diff) | |
| download | external_webkit-ecc9a729169b40aa92aafc472d01470e9f99aadb.zip external_webkit-ecc9a729169b40aa92aafc472d01470e9f99aadb.tar.gz external_webkit-ecc9a729169b40aa92aafc472d01470e9f99aadb.tar.bz2 | |
resolved conflicts for merge of 4eaaa2a0
Change-Id: I5da59f75c0ea1cdb7818dd3f8dc557fbf1d29885
Diffstat (limited to 'Source/WebCore/Android.mk')
| -rw-r--r-- | Source/WebCore/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk index c88e94b..6d43300 100644 --- a/Source/WebCore/Android.mk +++ b/Source/WebCore/Android.mk @@ -680,7 +680,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/android/TiledPage.cpp \ platform/graphics/android/TiledTexture.cpp \ platform/graphics/android/TransferQueue.cpp \ - platform/graphics/android/UpdateManager.cpp \ + platform/graphics/android/TreeManager.cpp \ platform/graphics/android/VerticalTextMap.cpp \ platform/graphics/android/VideoLayerAndroid.cpp \ platform/graphics/android/VideoLayerManager.cpp \ |