summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Friedman <dmail@google.com> 2014-06-04 03:05:26 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-06-04 03:05:26 +0000
commitdba68be33efe4ee322a9ff3d895ed257162c0908 (patch)
treeed5cab4075f27ecd6b138d2c37ffaf6d728f8841
parent93a27e236b88636e68543d5edd80e5a5c176fb57 (diff)
parent00aae2793d37ed098a80bc0a98e8008b36178714 (diff)
am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit '00aae2793d37ed098a80bc0a98e8008b36178714': 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>