OSDN Git Service

resolved conflicts for merge of 9dabd572 to master
authorGrace Kloba <klobag@google.com>
Wed, 20 Jan 2010 19:26:21 +0000 (11:26 -0800)
committerGrace Kloba <klobag@google.com>
Wed, 20 Jan 2010 19:26:21 +0000 (11:26 -0800)
commit12250939d507d6cacda32b1b073ccd0d06a88d11
tree3950da795e6bd9f449603ecef0ad816c8fa43b42
parenta01a68253f642c4d9219f0aca9ccc6c5da9e46b0
parent9dabd572bcca8e38d72ee40eaf442a9bb0790508
resolved conflicts for merge of 9dabd572 to master
WebCore/plugins/android/PluginViewAndroid.cpp
WebKit/android/jni/WebViewCore.cpp
WebKit/android/plugins/PluginWidgetAndroid.cpp
WebKit/android/plugins/PluginWidgetAndroid.h