tree a9af31c3247afd40799e9a7c2ee414770384a265
parent e3ba492e759f0797d990a952eb841cb608381da8
parent 854ad68046bb8eecec541782f9c8c18e405c3fe7
author Scott Main <smain@google.com> 1260517392 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260517392 -0800

am 4570dfa2: am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs

Merge commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d'

* commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d':
  docs: add the Bluetooth developer guide,