forked from github/cordova-android

Conflicts: framework/src/org/apache/cordova/PluginEntry.java framework/src/org/apache/cordova/PluginManager.java test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
Conflicts: framework/src/org/apache/cordova/PluginEntry.java framework/src/org/apache/cordova/PluginManager.java test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java