Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0CF1D200D4E for ; Thu, 16 Nov 2017 19:13:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0B5B71609EF; Thu, 16 Nov 2017 18:13:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 80834160BEA for ; Thu, 16 Nov 2017 19:13:55 +0100 (CET) Received: (qmail 49325 invoked by uid 500); 16 Nov 2017 18:13:54 -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 49239 invoked by uid 99); 16 Nov 2017 18:13:54 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Nov 2017 18:13:54 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 31EBC80683; Thu, 16 Nov 2017 18:13:54 +0000 (UTC) Date: Thu, 16 Nov 2017 18:13:55 +0000 To: "commits@cordova.apache.org" Subject: [cordova-android] 01/01: Merge pull request #417 from DavidStrausz/master MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: bowserj@apache.org In-Reply-To: <151085603408.32671.2921353891539508652@gitbox.apache.org> References: <151085603408.32671.2921353891539508652@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: cordova-android X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 64047801867946fb000ed1b52d9182da5d42abbc X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171116181354.31EBC80683@gitbox.apache.org> archived-at: Thu, 16 Nov 2017 18:13:56 -0000 This is an automated email from the ASF dual-hosted git repository. bowserj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cordova-android.git commit 64047801867946fb000ed1b52d9182da5d42abbc Merge: 3760616 5d99e50 Author: Joe Bowser AuthorDate: Thu Nov 16 10:13:50 2017 -0800 Merge pull request #417 from DavidStrausz/master CB-13580: (android) fix build for multiple apks (different product flavors) bin/templates/cordova/lib/builders/GenericBuilder.js | 19 +++++++++++++++++-- bin/templates/project/build.gradle | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cordova.apache.org" . --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org