OSDN Git Service

am f6e32e72: Merge change Icced7a09 into eclair
authorJaikumar Ganesh <jaikumar@google.com>
Fri, 11 Dec 2009 01:40:53 +0000 (17:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 01:40:53 +0000 (17:40 -0800)
commit368c332ddc804d5fb0bb2362f658e7a3706fb003
tree340ed100338afccb9e1ab485f7fd00aac0af9c66
parent75ca58d6f877541516f4f2710b4bed39fa7c4266
parentf6e32e72a902d9a309410bc5306a539ea850159f
am f6e32e72: Merge change Icced7a09 into eclair

Merge commit 'f6e32e72a902d9a309410bc5306a539ea850159f' into eclair-mr2

* commit 'f6e32e72a902d9a309410bc5306a539ea850159f':
  Maintain a list of all Bluetooth docks.
core/java/android/server/BluetoothService.java