tree 856edc394c1f01dda2a5c4407684745e778a8ea1
parent 8d670d345893fb9b9566f6b8c20202b77d4d211a
parent 5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6
author Scott Main <smain@google.com> 1259885599 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259885599 -0800

am 5d0806c9: Merge change Ia70bd8c4 into eclair

Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2

* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
  add BluetoothChat sample app to the dev guide