summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-10-15 18:23:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 18:23:34 -0700
commit81df9841c64e417fe2adfab0e8d694af09e07c0d (patch)
treee02b8ab105ca55afc5c26c6675294583a3f75d8c /docs
parentb2bd470010279fe45e2848aa8cd0b3ad6f6ca800 (diff)
parent2c1dab44834fb20deda9f380dae1bd7c1826b40b (diff)
downloadframeworks_base-81df9841c64e417fe2adfab0e8d694af09e07c0d.zip
frameworks_base-81df9841c64e417fe2adfab0e8d694af09e07c0d.tar.gz
frameworks_base-81df9841c64e417fe2adfab0e8d694af09e07c0d.tar.bz2
am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp * commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b': docs: fix typo; surface dev guide link in package description
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/wireless/bluetooth.jd6
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&lt;BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();