OSDN Git Service

am 8028cea1: (-s ours) am 8021537f: BT settings wait for HS service before connect...
authorJake Hamby <jhamby@google.com>
Fri, 15 Oct 2010 16:11:05 +0000 (09:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Oct 2010 16:11:05 +0000 (09:11 -0700)
Merge commit '8028cea196968a4744ac4b095f6fe6bc32467375'

* commit '8028cea196968a4744ac4b095f6fe6bc32467375':
  BT settings wait for HS service before connect.  DO NOT MERGE


Trivial merge