Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp * commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b': Fix media option settings for A2DP.
Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp * commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b': Fix media option settings for A2DP.