summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAndroid Code Review <code-review@android.com>2009-06-12 09:46:54 -0700
committerAndroid Code Review <code-review@android.com>2009-06-12 09:46:54 -0700
commitacec372211ccf25091e3156124beebbc0481c59d (patch)
treed53f8bdef2f2909006a2e218efc02b08ac2eb8af /core/java/android
parent7b16fc04d09e956b37849239e3c276d37b7235ab (diff)
parent8aa393b03f6d1f25313c658334e9b86a86a6f61f (diff)
downloadframeworks_base-acec372211ccf25091e3156124beebbc0481c59d.zip
frameworks_base-acec372211ccf25091e3156124beebbc0481c59d.tar.gz
frameworks_base-acec372211ccf25091e3156124beebbc0481c59d.tar.bz2
Merge change 10320
* changes: Fixed typo, RFC3296 is for LDAP, RFC2396 is for URI
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/Uri.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
index c23df21..08bd67e 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -371,7 +371,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
/**
* Creates a Uri which parses the given encoded URI string.
*
- * @param uriString an RFC 3296-compliant, encoded URI
+ * @param uriString an RFC 2396-compliant, encoded URI
* @throws NullPointerException if uriString is null
* @return Uri for this given uri string
*/