summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-10-17 13:49:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-17 13:49:45 -0700
commitdbb78f0e4ee3a1ba3e3418b0c1bf8b51e4fa2019 (patch)
treed005eef53e3e7e0bf00b8c43ccb26b2152c49af5 /docs/html
parent2d8933879c1807935fd9540444a2a7723fce343b (diff)
parent81df9841c64e417fe2adfab0e8d694af09e07c0d (diff)
downloadframeworks_base-dbb78f0e4ee3a1ba3e3418b0c1bf8b51e4fa2019.zip
frameworks_base-dbb78f0e4ee3a1ba3e3418b0c1bf8b51e4fa2019.tar.gz
frameworks_base-dbb78f0e4ee3a1ba3e3418b0c1bf8b51e4fa2019.tar.bz2
am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '81df9841c64e417fe2adfab0e8d694af09e07c0d' * commit '81df9841c64e417fe2adfab0e8d694af09e07c0d': docs: fix typo; surface dev guide link in package description
Diffstat (limited to 'docs/html')
-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();