Andrew Grieve 96a1192474 Merge branch 'master' into 4.0.x (back button default behaviour fix) ... Conflicts: framework/src/org/apache/cordova/CordovaChromeClient.java framework/src/org/apache/cordova/CordovaWebView.java		2014-06-23 14:50:01 -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 (back button default behaviour fix)	2014-06-23 14:50:01 -04:00