Fixing conflict

framework/src/com/phonegap/api/Plugin.java

@@ -74,6 +74,12 @@ public abstract class Plugin implements IPlugin {
     public void onResume() {
     }
     
+    /**
+     * Called when the activity receives a new intent. 
+     */
+	public void onNewIntent(Intent intent) {
+	}
+    
     /**
      * The final call you receive before your activity is destroyed. 
      */

framework/src/com/phonegap/api/PluginManager.java

@@ -13,6 +13,7 @@ import java.util.Map.Entry;
 import org.json.JSONArray;
 import org.json.JSONException;
 
+import android.content.Intent;
 import android.webkit.WebView;
 
 /**
@@ -265,4 +266,14 @@ public final class PluginManager {
     		plugin.onDestroy();
     	}
     }
+    
+    public void onNewIntent(Intent intent) {
+    	java.util.Set<Entry<String,Plugin>> s = this.plugins.entrySet();
+    	java.util.Iterator<Entry<String,Plugin>> it = s.iterator();
+    	while(it.hasNext()) {
+    		Entry<String,Plugin> entry = it.next();
+    		Plugin plugin = entry.getValue();
+    		plugin.onNewIntent(intent);
+    	}
+    }
 }