Merge "Fix 3366514, browser emulator no longer crashes" into honeycomb

author Russell Brenner <russellbrenner@google.com>

Tue, 1 Feb 2011 01:41:52 +0000 (17:41 -0800)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 1 Feb 2011 01:41:52 +0000 (17:41 -0800)
author Russell Brenner <russellbrenner@google.com>
Tue, 1 Feb 2011 01:41:52 +0000 (17:41 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 1 Feb 2011 01:41:52 +0000 (17:41 -0800)
diff --cc WebCore/platform/graphics/android/BaseLayerAndroid.cpp
Simple merge
author	Russell Brenner <russellbrenner@google.com>
	Tue, 1 Feb 2011 01:41:52 +0000 (17:41 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 1 Feb 2011 01:41:52 +0000 (17:41 -0800)