am 40bd3d28: Merge "Work around droiddoc bug http://b/2022288."

Merge commit '40bd3d28fb2f34f060e7413cc19eeeb195c0ff90' into dalvik-dev

* commit '40bd3d28fb2f34f060e7413cc19eeeb195c0ff90':
  Work around droiddoc bug http://b/2022288.

1 files changed, 3 insertions, 3 deletions

diff --git a/luni/src/main/java/java/lang/String.java b/luni/src/main/java/java/lang/String.java
index 4cc902f..2dda14b 100644
--- a/luni/src/main/java/java/lang/String.java
+++ b/luni/src/main/java/java/lang/String.java
@@ -2210,8 +2210,8 @@ public final class String implements Serializable, Comparable<String>,
      * the output. In particular, floating point numbers may be output with
      * ',' instead of '.' as the decimal separator if that's what the user's
      * locale dictates. If you're formatting a string other than for human
-     * consumption, you should use {@link #format(java.util.Locale, java.lang.String, java.lang.Object...)} and
-     * supply {@code Locale.US}.
+     * consumption, you should use the {@code format(Locale, String, Object...)}
+     * overload and supply {@code Locale.US}.
      * 
      * @param format
      *            a format string.
@@ -2231,7 +2231,7 @@ public final class String implements Serializable, Comparable<String>,
 
     /**
      * Returns a formatted string, using the supplied format and arguments,
-     * accordingly to the specified locale.
+     * localized to the given locale.
      * <p>
      * Note that this is a convenience method. Using it involves creating an
      * internal {@link java.util.Formatter} instance on-the-fly, which is