Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
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/d42489c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/d42489c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/d42489c6 Branch: refs/heads/master Commit: d42489c67a552002177222d65e2fbb4a06d3237c Parents: 99fb3eb e2047af Author: Anis Kadri <anis.ka...@gmail.com> Authored: Thu Jun 28 16:47:18 2012 -0700 Committer: Anis Kadri <anis.ka...@gmail.com> Committed: Thu Jun 28 16:47:18 2012 -0700 ---------------------------------------------------------------------- bin/create.js | 43 ++- bin/templates/cordova/cordova.js | 4 +- bin/templates/cordova/log.bat | 1 + framework/project.properties | 1 + .../src/org/apache/cordova/CameraLauncher.java | 308 ++++++++------- framework/src/org/apache/cordova/ExifHelper.java | 20 + framework/src/org/apache/cordova/FileTransfer.java | 5 +- 7 files changed, 222 insertions(+), 160 deletions(-) ----------------------------------------------------------------------