diff options
author | Scott Main <smain@google.com> | 2010-10-15 12:35:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 12:35:04 -0700 |
commit | 2c1dab44834fb20deda9f380dae1bd7c1826b40b (patch) | |
tree | 038b37462d4d30858dee06acc6245ec411091193 /docs | |
parent | 7f3addf37f0aa106507792e8d9eaa3fb6662cdbb (diff) | |
parent | fda5b19c757645e957c2a224f269aefe39fb1e1c (diff) | |
download | frameworks_base-2c1dab44834fb20deda9f380dae1bd7c1826b40b.zip frameworks_base-2c1dab44834fb20deda9f380dae1bd7c1826b40b.tar.gz frameworks_base-2c1dab44834fb20deda9f380dae1bd7c1826b40b.tar.bz2 |
am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread
* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
docs: fix typo; surface dev guide link in package description
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/guide/topics/wireless/bluetooth.jd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd index fa2875b..98b6e7d 100644 --- a/docs/html/guide/topics/wireless/bluetooth.jd +++ b/docs/html/guide/topics/wireless/bluetooth.jd @@ -9,7 +9,7 @@ page.title=Bluetooth <li>Android's bluetooth APIs allow your application to perform wireless data transactions with other devices</li> </ul> - + <h2>In this document</h2> <ol> <li><a href="#TheBasics">The Basics</a></li> @@ -32,7 +32,7 @@ other devices</li> </li> <li><a href="#ManagingAConnection">Managing a Connection</a></li> </ol> - + <h2>Key classes</h2> <ol> <li>{@link android.bluetooth.BluetoothAdapter}</li> @@ -289,7 +289,7 @@ is discussed below.</p> of paired devices to see if the desired device is already known. To do so, call {@link android.bluetooth.BluetoothAdapter#getBondedDevices()}. This will return a Set of {@link android.bluetooth.BluetoothDevice}s representing -paired devices. For example, you can query all paired devices and then add then +paired devices. For example, you can query all paired devices and then show the name of each device to the user, using an ArrayAdapter:</p> <pre> Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices(); |