am 09550fde: am c9966891: Merge change Ibb245ea7 into eclair

Merge commit '09550fde489a6d5155f005fec9b328f1b2a878a6' into eclair-mr2-plus-aosp

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

core/java/android/webkit/WebView.java

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