summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-11 12:18:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-11 12:18:20 -0700
commit3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4 (patch)
tree0f214b012cf7dd5de9543fad9356956aa8bb332e /core/java/android/content
parent6ee44d1ff30627388bf3afa5fa542780af8f4005 (diff)
parentc53fc4ec9ec2e808f25738b1bad3a21a87e28651 (diff)
downloadframeworks_base-3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4.zip
frameworks_base-3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4.tar.gz
frameworks_base-3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4.tar.bz2
Merge change 1377 into donut
* changes: Fix typo in javadoc
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/Intent.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 3ebf816..81f72ac 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1940,7 +1940,7 @@ public class Intent implements Parcelable {
/**
* If set, this marks a point in the task's activity stack that should
* be cleared when the task is reset. That is, the next time the task
- * is broad to the foreground with
+ * is brought to the foreground with
* {@link #FLAG_ACTIVITY_RESET_TASK_IF_NEEDED} (typically as a result of
* the user re-launching it from home), this activity and all on top of
* it will be finished so that the user does not return to them, but