Merge branch 'master' into 4.0.x (Gradle env vars)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/215adab1 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/215adab1 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/215adab1 Branch: refs/heads/4.0.x Commit: 215adab1f9f0076af7d9b940caaf379fce744285 Parents: c32bcca 7ce46ed Author: Ian Clelland <[email protected]> Authored: Wed Sep 17 15:58:46 2014 -0400 Committer: Ian Clelland <[email protected]> Committed: Wed Sep 17 15:58:46 2014 -0400 ---------------------------------------------------------------------- bin/templates/project/build.gradle | 2 +- bin/templates/project/cordova.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
