Merge branch 'CB-7493' of https://github.com/MSOpenTech/cordova-android
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/94915253 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/94915253 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/94915253 Branch: refs/heads/4.0.x Commit: 949152532c05dfc3db17866551e013221cf00355 Parents: 7ce46ed d52ca93 Author: purplecabbage <[email protected]> Authored: Wed Sep 17 14:58:08 2014 -0700 Committer: purplecabbage <[email protected]> Committed: Wed Sep 17 14:58:08 2014 -0700 ---------------------------------------------------------------------- .travis.yml | 5 +++++ package.json | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
