| commit | 6d3aa67bdaf408cce04618811cae180f4540af47 | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Fri Oct 15 09:11:05 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 15 09:11:05 2010 -0700 |
| tree | 25729375d1f64a7b2748fe9bc9da208c165d5cfa | |
| parent | a3757ca27adc64970c7b39dff51f6e351abd8f57 [diff] | |
| parent | 8028cea196968a4744ac4b095f6fe6bc32467375 [diff] |
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