tree fdb91a1def9e3a32717c543e71755e4511c2aeac
parent 57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870
parent 6d95fc0a2ca910212a43c4547c0ef000659b72dc
author Scott Main <smain@google.com> 1258739662 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258739662 -0800

am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device

Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair

* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
  docs for ESR: add docs to bluetooth explainin that discovery should