am 049912b7: am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread

Merge commit '049912b76f320c55cfe56394e520ee2c35f913b8'

* commit '049912b76f320c55cfe56394e520ee2c35f913b8':
  Fix to get A2DP to connect after unpairing