Merge "DO NOT MERGE Fix SW extras for layers" into ics-mr1

diff --cc Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
Simple merge

diff --cc Source/WebCore/platform/graphics/android/BaseLayerAndroid.h
Simple merge

diff --cc Source/WebCore/platform/graphics/android/GLWebViewState.cpp
Simple merge

diff --cc Source/WebCore/platform/graphics/android/PaintedSurface.cpp
Simple merge

diff --cc Source/WebCore/platform/graphics/android/TiledPage.cpp
Simple merge

diff --cc Source/WebCore/platform/graphics/android/TiledPage.h
Simple merge

diff --cc Source/WebCore/platform/graphics/android/TiledTexture.cpp
Simple merge