Merge branch '2.8.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.8.x
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d36b1cc8 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d36b1cc8 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d36b1cc8 Branch: refs/heads/2.8.x Commit: d36b1cc89d434ad3cb4015905762259a837b1d20 Parents: 683e32c 6b5535e Author: Joe Bowser <[email protected]> Authored: Sun May 26 16:13:50 2013 -0700 Committer: Joe Bowser <[email protected]> Committed: Sun May 26 16:13:50 2013 -0700 ---------------------------------------------------------------------- VERSION | 2 +- framework/assets/www/cordova.js | 156 +++++++++++++-------- framework/src/org/apache/cordova/Device.java | 2 +- 3 files changed, 97 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
