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 58ACC200D21 for ; Mon, 16 Oct 2017 19:37:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 577081609E3; Mon, 16 Oct 2017 17:37:39 +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 CD4BE1609EF for ; Mon, 16 Oct 2017 19:37:38 +0200 (CEST) Received: (qmail 48493 invoked by uid 500); 16 Oct 2017 17:37:38 -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 48484 invoked by uid 99); 16 Oct 2017 17:37:38 -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; Mon, 16 Oct 2017 17:37:37 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3FD4F81985; Mon, 16 Oct 2017 17:37:34 +0000 (UTC) Date: Mon, 16 Oct 2017 17:37:35 +0000 To: "commits@cordova.apache.org" Subject: [cordova-android] 01/01: Merge pull request #410 from filmaj/emu-fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: bowserj@apache.org In-Reply-To: <150817545428.12767.16869883768245058939@gitbox.apache.org> References: <150817545428.12767.16869883768245058939@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: 697c8f129ce6bcc93d6c864e3bf80f195922ff84 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171016173736.3FD4F81985@gitbox.apache.org> archived-at: Mon, 16 Oct 2017 17:37:39 -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 697c8f129ce6bcc93d6c864e3bf80f195922ff84 Merge: c12f7fe ec83d48 Author: Joe Bowser AuthorDate: Mon Oct 16 10:37:30 2017 -0700 Merge pull request #410 from filmaj/emu-fixes CB-13404, CB-13406: `best_image` function fixes when choosing emulator images to deploy to bin/templates/cordova/lib/emulator.js | 6 ++-- package.json | 3 +- spec/unit/emulator.spec.js | 65 +++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 4 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