summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@google.com>2013-01-14 11:11:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-14 11:11:26 -0800
commit8e45679adfe03271dd1cc627d6c4542649a0446a (patch)
tree2a77229ae63e1a87f157c7fcdd1c0ed6132e9a3f /core/java/android/content
parentad2886325081a47ebb173468717d66a0486dcf9c (diff)
parent026f91915f2ad710b93284b9a604d3c39161b2ed (diff)
downloadframeworks_base-8e45679adfe03271dd1cc627d6c4542649a0446a.zip
frameworks_base-8e45679adfe03271dd1cc627d6c4542649a0446a.tar.gz
frameworks_base-8e45679adfe03271dd1cc627d6c4542649a0446a.tar.bz2
am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '026f91915f2ad710b93284b9a604d3c39161b2ed': docs: Fix a bunch of issues
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/BroadcastReceiver.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/BroadcastReceiver.java b/core/java/android/content/BroadcastReceiver.java
index 1500b00..4f42d50 100644
--- a/core/java/android/content/BroadcastReceiver.java
+++ b/core/java/android/content/BroadcastReceiver.java
@@ -117,7 +117,7 @@ import android.util.Slog;
*
* <ul>
* <li><p>The Intent namespace is global. Make sure that Intent action names and
- * other strings are written in a namespace you own, or else you may inadvertantly
+ * other strings are written in a namespace you own, or else you may inadvertently
* conflict with other applications.
* <li><p>When you use {@link Context#registerReceiver(BroadcastReceiver, IntentFilter)},
* <em>any</em> application may send broadcasts to that registered receiver. You can