Merge commit '2bc9e0067f0e9ed7c40ebea98ead8e6962b32bc2' into eclair-mr2-plus-aosp * commit '2bc9e0067f0e9ed7c40ebea98ead8e6962b32bc2': Fix typo in AudioPolicyManager log for voice recognition mode.