Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp * commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162': Fix bug 2242585 to unhide the new audio recording sources.
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp * commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162': Fix bug 2242585 to unhide the new audio recording sources.