Merge change 10320

Android Code Review · Android Code Review · commit acec372211cc · 2009-06-12T09:46:54.000-07:00
* changes:
  Fixed typo, RFC3296 is for LDAP, RFC2396 is for URI
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
@@ -371,7 +371,7 @@ public int compareTo(Uri other) {
     /**
      * 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
      */

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ public int compareTo(Uri other) {`
`371`	`371`	`/**`
`372`	`372`	`* Creates a Uri which parses the given encoded URI string.`
`373`	`373`	`*`
`374`		`- * @param uriString an RFC 3296-compliant, encoded URI`
	`374`	`+ * @param uriString an RFC 2396-compliant, encoded URI`
`375`	`375`	`* @throws NullPointerException if uriString is null`
`376`	`376`	`* @return Uri for this given uri string`
`377`	`377`	`*/`