diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-07-28 15:23:21 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2009-07-28 15:23:21 -0700 |
| commit | 02f5228c3c224dc8804cbedd40899fa0c42bfd4a (patch) | |
| tree | 21267ea74f5159b7aa52751c6e8a3de368c08c39 /core/java/android/content/Intent.java | |
| parent | b2fe1fd4ae31df7a0366c59c4a1393fb281c4fde (diff) | |
| parent | f0d83fd907e0d2a0b2fe563cea9ffa830ecfd33f (diff) | |
| download | frameworks_base-02f5228c3c224dc8804cbedd40899fa0c42bfd4a.zip frameworks_base-02f5228c3c224dc8804cbedd40899fa0c42bfd4a.tar.gz frameworks_base-02f5228c3c224dc8804cbedd40899fa0c42bfd4a.tar.bz2 | |
resolved conflicts for merge of f0d83fd9 to master
Diffstat (limited to 'core/java/android/content/Intent.java')
| -rw-r--r-- | core/java/android/content/Intent.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 66b507d..64ee60e 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2412,7 +2412,7 @@ public class Intent implements Parcelable { /** * Create an intent from a URI. This URI may encode the action, * category, and other intent fields, if it was returned by - * {@link #toUri}.. If the Intent was not generate by toUri(), its data + * {@link #toUri}. If the Intent was not generate by toUri(), its data * will be the entire URI and its action will be ACTION_VIEW. * * <p>The URI given here must not be relative -- that is, it must include |