OSDN Git Service

Merge "Scroll position now passed to all layers" into ics-mr1
authorChris Craik <ccraik@google.com>
Fri, 2 Dec 2011 01:08:14 +0000 (17:08 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 2 Dec 2011 01:08:14 +0000 (17:08 -0800)
1  2 
Source/WebCore/platform/graphics/android/GLWebViewState.cpp
Source/WebKit/android/nav/WebView.cpp

Simple merge