OSDN Git Service

resolved conflicts for merge of 98c97471 to master
authorGrace Kloba <klobag@google.com>
Mon, 25 Jan 2010 18:53:28 +0000 (10:53 -0800)
committerGrace Kloba <klobag@google.com>
Mon, 25 Jan 2010 18:53:28 +0000 (10:53 -0800)
commit3f8c83a688eb0106be34c27124fa482ff383b635
treea40f4bd6a99aff01693986707b9a31aa1a9ebd8e
parentf194ee8ea5e8e00930a6caddc3ef6f5031493c2b
parent98c97471771055661f977820d2101e25b4a51b86
resolved conflicts for merge of 98c97471 to master
WebCore/plugins/android/PluginPackageAndroid.cpp