Merge branch 'master' into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/763e6f0e Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/763e6f0e Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/763e6f0e Branch: refs/heads/dev Commit: 763e6f0e9a0f996e57b1979d1127a12a8dc14aa3 Parents: 1f22a17 fa52e35 Author: Andrew Grieve <[email protected]> Authored: Fri Sep 6 00:15:45 2013 -0400 Committer: Andrew Grieve <[email protected]> Committed: Fri Sep 6 00:15:45 2013 -0400 ---------------------------------------------------------------------- src/android/CameraLauncher.java | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/763e6f0e/src/android/CameraLauncher.java ----------------------------------------------------------------------
