am 67c90537: am 72acb46d: Fix the crash of exiting full screen by checking null.

author Grace Kloba <klobag@google.com>

Thu, 21 Jan 2010 03:14:00 +0000 (19:14 -0800)

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

Thu, 21 Jan 2010 03:14:00 +0000 (19:14 -0800)
author Grace Kloba <klobag@google.com>
Thu, 21 Jan 2010 03:14:00 +0000 (19:14 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 21 Jan 2010 03:14:00 +0000 (19:14 -0800)
diff --cc WebKit/android/jni/WebViewCore.cpp
Simple merge
diff --cc WebKit/android/plugins/PluginWidgetAndroid.cpp
Simple merge
author	Grace Kloba <klobag@google.com>
	Thu, 21 Jan 2010 03:14:00 +0000 (19:14 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 21 Jan 2010 03:14:00 +0000 (19:14 -0800)
		1	2
WebKit/android/jni/WebViewCore.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
WebKit/android/plugins/PluginWidgetAndroid.cpp	patch \|	diff1 \|	diff2 \|	blob \| history