diff options
| author | Scott Kennedy <skennedy@google.com> | 2013-01-14 11:13:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-14 11:13:25 -0800 |
| commit | 5d6d6aab255aa17fde979d954c839402837b4243 (patch) | |
| tree | 87199c1439a86d0130148d7a67a690e6f6947d11 /core/java/android/content | |
| parent | cab31f210930b12778c841a96a2c024b2dbb08b4 (diff) | |
| parent | 8e45679adfe03271dd1cc627d6c4542649a0446a (diff) | |
| download | frameworks_base-5d6d6aab255aa17fde979d954c839402837b4243.zip frameworks_base-5d6d6aab255aa17fde979d954c839402837b4243.tar.gz frameworks_base-5d6d6aab255aa17fde979d954c839402837b4243.tar.bz2 | |
am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '8e45679adfe03271dd1cc627d6c4542649a0446a':
docs: Fix a bunch of issues
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/BroadcastReceiver.java | 2 |
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 |