Commit 09550fde authored Nov 11, 2009 by Grace Kloba Committed by Android Git Automerger Nov 11, 2009

am c9966891: Merge change Ibb245ea7 into eclair

Merge commit 'c9966891' into eclair-mr2

* commit 'c9966891':
  Return an empty PluginList instead of null for the

core/java/android/webkit/WebView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2801,7 +2801,7 @@ public class WebView extends AbsoluteLayout
		*/
		@Deprecated
		public static synchronized PluginList getPluginList() {
		return null;
		return new PluginList();
		}

		/**