Merge branch 'master' into 4.0.x (gradle)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d022be54 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d022be54 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d022be54 Branch: refs/heads/4.0.x Commit: d022be547befb8926e4220fa9681e466dc9800b6 Parents: 215adab 3f83fdb Author: Andrew Grieve <[email protected]> Authored: Wed Sep 17 21:27:55 2014 -0400 Committer: Andrew Grieve <[email protected]> Committed: Wed Sep 17 21:27:55 2014 -0400 ---------------------------------------------------------------------- .travis.yml | 5 +++++ bin/templates/project/build.gradle | 10 ++++++---- package.json | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d022be54/package.json ----------------------------------------------------------------------
