Merge "Work around droiddoc bug http://b/2022288."
diff --git a/luni/src/main/java/java/lang/String.java b/luni/src/main/java/java/lang/String.java
index d7d2f78..d3c953b 100644
--- a/luni/src/main/java/java/lang/String.java
+++ b/luni/src/main/java/java/lang/String.java
@@ -2200,8 +2200,8 @@
* 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.
@@ -2221,7 +2221,7 @@
/**
* 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