Updated Branches: refs/heads/master c1c907596 -> 507554b8e
Fixing merge error 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/507554b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/507554b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/507554b8 Branch: refs/heads/master Commit: 507554b8e8543a50c37cda3f19f1e14b96859ced Parents: 4795133 c1c9075 Author: macdonst <[email protected]> Authored: Wed Jun 20 12:47:00 2012 -0400 Committer: macdonst <[email protected]> Committed: Wed Jun 20 12:47:00 2012 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
