am 562a8a46: am 53c84f3c: Do not allow the plugin to show or hide the keyboard unless...

author Derek Sollenberger <djsollen@google.com>

Mon, 25 Jan 2010 21:26:14 +0000 (13:26 -0800)

committer Android Git Automerger <android-git-automerger@android.com>

Mon, 25 Jan 2010 21:26:14 +0000 (13:26 -0800)
author Derek Sollenberger <djsollen@google.com>
Mon, 25 Jan 2010 21:26:14 +0000 (13:26 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 25 Jan 2010 21:26:14 +0000 (13:26 -0800)
diff --cc WebKit/android/plugins/PluginWidgetAndroid.cpp
Simple merge
diff --cc WebKit/android/plugins/PluginWidgetAndroid.h
Simple merge
author	Derek Sollenberger <djsollen@google.com>
	Mon, 25 Jan 2010 21:26:14 +0000 (13:26 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 25 Jan 2010 21:26:14 +0000 (13:26 -0800)
		1	2
WebKit/android/plugins/PluginWidgetAndroid.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
WebKit/android/plugins/PluginWidgetAndroid.h	patch \|	diff1 \|	diff2 \|	blob \| history