Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ECF5217D6F for ; Tue, 21 Oct 2014 17:00:24 +0000 (UTC) Received: (qmail 1187 invoked by uid 500); 21 Oct 2014 17:00:24 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 1097 invoked by uid 500); 21 Oct 2014 17:00:24 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 988 invoked by uid 99); 21 Oct 2014 17:00:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Oct 2014 17:00:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 62AAE8B7B35; Tue, 21 Oct 2014 17:00:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Date: Tue, 21 Oct 2014 17:00:31 -0000 Message-Id: In-Reply-To: <74c9bdb6f7a349dbb2c21603b9388270@git.apache.org> References: <74c9bdb6f7a349dbb2c21603b9388270@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] android commit: Merge branch 'master' into 4.0.x (gradle signing+SecureRandom) Merge branch 'master' into 4.0.x (gradle signing+SecureRandom) Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/cc7d3522 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/cc7d3522 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/cc7d3522 Branch: refs/heads/4.0.x Commit: cc7d352209e3f6d841fe631a510e6288cbe308b1 Parents: 7ad16e5 ce5d9a2 Author: Andrew Grieve Authored: Tue Oct 21 13:00:07 2014 -0400 Committer: Andrew Grieve Committed: Tue Oct 21 13:00:07 2014 -0400 ---------------------------------------------------------------------- bin/templates/project/build.gradle | 27 ++++++++++++++++---- .../src/org/apache/cordova/CordovaBridge.java | 5 +++- 2 files changed, 26 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org