OSDN Git Service

resolved conflicts for merge of 9653e7ce to master
authorLeon Scroggins <scroggo@google.com>
Mon, 11 Jan 2010 15:13:50 +0000 (10:13 -0500)
committerLeon Scroggins <scroggo@google.com>
Mon, 11 Jan 2010 15:13:50 +0000 (10:13 -0500)
commit7c1b3b8c573eed35ddc15fd7dd3d762403f30755
tree0b9adcea438a16aacec2aa7990716b331b58a9cd
parent201cb71276abda07e3ac4e0bf8bc1f8966a24757
parent9653e7ce8a33c5e4b2931a3594e82c49597601e2
resolved conflicts for merge of 9653e7ce to master
WebKit/android/jni/WebViewCore.cpp
WebKit/android/jni/WebViewCore.h
WebKit/android/nav/WebView.cpp