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)
commit6d3aa67bdaf408cce04618811cae180f4540af47
tree25729375d1f64a7b2748fe9bc9da208c165d5cfa
parenta3757ca27adc64970c7b39dff51f6e351abd8f57
parent8028cea196968a4744ac4b095f6fe6bc32467375
am 8028cea1: (-s ours) am 8021537f: BT settings wait for HS service before connect.  DO NOT MERGE

Merge commit '8028cea196968a4744ac4b095f6fe6bc32467375'

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