From d304649a4066bf30fc7005e242e9db51e0875839 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Tue, 18 Jan 2011 09:43:30 -0800
Subject: [PATCH 1/2] Turning an assertion into an error log.

Change-Id: I276945246449fcad2644805236a9e6b2a212090d
related-to-bug: 3314324

From 92e6c009053224c9b980a7b5fa7f25035175180d Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Thu, 11 Nov 2010 09:43:25 -0800
Subject: [PATCH 2/2] do not merge bug 3370834 Cherrypick from master CL 79327

Use input source to determine whether voice reco mode is enabled.

Change-Id: I1efe64904b19575b590ce4b83f44d18b7d064f6b