summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2011-05-16 11:01:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-16 11:01:44 -0700
commit8b8bfc5d28d9746bf30b2de45f879d9481b07d6f (patch)
tree428fde579c3236a0f0740af003f3d55de20acabd /docs
parent582c1361e8a6443812a97f18094be1f8279645a0 (diff)
parentbabf844f4606f07de0e3349b5847faa2f8f208cc (diff)
downloadframeworks_base-8b8bfc5d28d9746bf30b2de45f879d9481b07d6f.zip
frameworks_base-8b8bfc5d28d9746bf30b2de45f879d9481b07d6f.tar.gz
frameworks_base-8b8bfc5d28d9746bf30b2de45f879d9481b07d6f.tar.bz2
am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit 'babf844f4606f07de0e3349b5847faa2f8f208cc': Doc change: typo fix
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/android-3.1.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/sdk/android-3.1.jd b/docs/html/sdk/android-3.1.jd
index 57fe1eb..992b7d1 100644
--- a/docs/html/sdk/android-3.1.jd
+++ b/docs/html/sdk/android-3.1.jd
@@ -107,8 +107,8 @@ discover, communicate with, and manage a variety of device types connected over
USB. </p>
<p>The stack and APIs distinguish two basic types of USB hardware, based on
-whether the platform iself is acting as host or the external hardware is acting
-as host: </p>
+whether the Android-powered device is acting as host or the external hardware
+is acting as host: </p>
<ul>
<li>A <em>USB device</em> is a piece of connected hardware that depends on the