summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Friedman <dmail@google.com> 2014-06-04 03:09:34 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-06-04 03:09:34 +0000
commit689eb9e98e5f03f4502358e52f07158b31b8e5e5 (patch)
tree624828f4f6f7cb1171a92d26a6fe62cfc9588765
parente21d8d7b23f3978ad78d71a7e4b2b4311035d679 (diff)
parentdba68be33efe4ee322a9ff3d895ed257162c0908 (diff)
am dba68be3: am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit 'dba68be33efe4ee322a9ff3d895ed257162c0908': Fixed typos. "describe"-->"describes"; "allow"-->"allows"
-rw-r--r--docs/html/guide/components/fundamentals.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/components/fundamentals.jd b/docs/html/guide/components/fundamentals.jd
index 9ac063ea8aff..fd1a7a859c58 100644
--- a/docs/html/guide/components/fundamentals.jd
+++ b/docs/html/guide/components/fundamentals.jd
@@ -335,8 +335,8 @@ documentation. </p>
{@link android.content.Intent} to start activities, services, and broadcast receivers. You can do so
by explicitly naming the target component (using the component class name) in the intent. However,
the real power of intents lies in the concept of <em>implicit intents</em>. An implicit intent
-simply describe the type of action to perform (and optionally, the data upon which you’d like to
-perform the action) and allow the system to find a component on the device that can perform the
+simply describes the type of action to perform (and, optionally, the data upon which you’d like to
+perform the action) and allows the system to find a component on the device that can perform the
action and start it. If there are multiple components that can perform the action described by the
intent, then the user selects which one to use.</p>