Andrew Grieve 1571b26a65 Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init) ... Conflicts: framework/src/org/apache/cordova/CordovaActivity.java framework/src/org/apache/cordova/CordovaChromeClient.java framework/src/org/apache/cordova/CordovaWebView.java framework/src/org/apache/cordova/CordovaWebViewClient.java framework/src/org/apache/cordova/PluginManager.java		2014-07-07 16:23:51 -04:00
..
cordova	Rename App->CoreAndroid in defaults.xml (related to 635a6279a9)	2014-06-17 20:55:55 -04:00
project	Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)	2014-07-07 16:23:51 -04:00