am f6e32e72: Merge change Icced7a09 into eclair

Merge commit 'f6e32e72a902d9a309410bc5306a539ea850159f' into eclair-plus-aosp

* commit 'f6e32e72a902d9a309410bc5306a539ea850159f':
  Maintain a list of all Bluetooth docks.