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 /core/java/android/bluetooth | |
| 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 'core/java/android/bluetooth')
| -rw-r--r-- | core/java/android/bluetooth/package.html | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/bluetooth/package.html b/core/java/android/bluetooth/package.html index 5ff240c..9ac42dc 100644 --- a/core/java/android/bluetooth/package.html +++ b/core/java/android/bluetooth/package.html @@ -1,7 +1,11 @@ <HTML> <BODY> -Provides classes that manage Bluetooth functionality, such as scanning for -devices, connecting with devices, and managing data transfer between devices. +<p>Provides classes that manage Bluetooth functionality, such as scanning for +devices, connecting with devices, and managing data transfer between devices.</p> + +<p>For a complete guide to using the Bluetooth APIs, see the <a +href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> +{@more} <p>The Bluetooth APIs let applications:</p> <ul> @@ -20,9 +24,6 @@ also requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission. </p> -<p>For a detailed guide to using the Bluetooth APIs, see the <a -href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth Dev Guide topic</a>.</p> - <p class="note"><strong>Note:</strong> Not all Android devices are guaranteed to have Bluetooth functionality.</p> </BODY> |