Merge commit '22a2d7186d015efcd648dff99500f8467463be82' into gingerbread-plus-aosp * commit '22a2d7186d015efcd648dff99500f8467463be82': Audio policy manager changes for audio effects
Merge commit '22a2d7186d015efcd648dff99500f8467463be82' into gingerbread-plus-aosp * commit '22a2d7186d015efcd648dff99500f8467463be82': Audio policy manager changes for audio effects