OSDN Git Service

am 67ed0ede: Merge webkit.org at r50258 : HistoryController has been factored out...
authorSteve Block <steveblock@google.com>
Tue, 10 Nov 2009 23:24:04 +0000 (15:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Nov 2009 23:24:04 +0000 (15:24 -0800)
commit38de8d834d73d6f69a0ef86a221f52799e0856eb
treee8c201abb4e88e078c71162a7203e0bbb24e7ba2
parent98b4e753ac7209ad7a33921e64001a4fe5176876
parent67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a
am 67ed0ede: Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader.

Merge commit '67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a'

* commit '67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a':
  Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader.
WebKit/android/jni/WebHistory.cpp
WebKit/android/jni/WebViewCore.cpp