forked from github/cordova-android

Conflicts: framework/src/org/apache/cordova/CordovaActivity.java framework/src/org/apache/cordova/PluginManager.java
Conflicts: framework/src/org/apache/cordova/CordovaActivity.java framework/src/org/apache/cordova/PluginManager.java