Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/b032dcca Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b032dcca Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b032dcca Branch: refs/heads/2.9.x Commit: b032dcca1637f37a3152a28f488cc639e1bbd5ea Parents: 01d6ae5 03c5208 Author: Joe Bowser <[email protected]> Authored: Thu Jun 20 16:33:17 2013 -0700 Committer: Joe Bowser <[email protected]> Committed: Thu Jun 20 16:33:17 2013 -0700 ---------------------------------------------------------------------- framework/assets/www/cordova.js | 129 ++++++++++++++++++++++++++--------- 1 file changed, 97 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
