Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB5CE91F2 for ; Wed, 20 Jun 2012 16:49:30 +0000 (UTC) Received: (qmail 44240 invoked by uid 500); 20 Jun 2012 16:49:30 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 44214 invoked by uid 500); 20 Jun 2012 16:49:30 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 44201 invoked by uid 99); 20 Jun 2012 16:49:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jun 2012 16:49:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 44C2A12AC9; Wed, 20 Jun 2012 16:49:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: macdonst@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] android commit: Fixing merge error Message-Id: <20120620164930.44C2A12AC9@tyr.zones.apache.org> Date: Wed, 20 Jun 2012 16:49:30 +0000 (UTC) Updated Branches: refs/heads/master c1c907596 -> 507554b8e Fixing merge error Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/507554b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/507554b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/507554b8 Branch: refs/heads/master Commit: 507554b8e8543a50c37cda3f19f1e14b96859ced Parents: 4795133 c1c9075 Author: macdonst Authored: Wed Jun 20 12:47:00 2012 -0400 Committer: macdonst Committed: Wed Jun 20 12:47:00 2012 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------