Updated Branches: refs/heads/master fed368d55 -> 486eb149f
Merge branch 'master' into plugin_reset Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/486eb149 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/486eb149 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/486eb149 Branch: refs/heads/master Commit: 486eb149f21207950d2d67c6591898caef5fa83d Parents: faa034a fed368d Author: Braden Shepherdson <bra...@chromium.org> Authored: Mon Sep 24 14:38:17 2012 -0400 Committer: Braden Shepherdson <bra...@chromium.org> Committed: Mon Sep 24 14:38:17 2012 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/FileTransfer.java | 20 +++++++++----- .../src/org/apache/cordova/NetworkManager.java | 7 +++-- 2 files changed, 17 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/486eb149/framework/src/org/apache/cordova/NetworkManager.java ----------------------------------------------------------------------
