am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev

* commit '93a2c97dc71b211de1e9e3a7a64aa301309f3308':
  Improve Html.toHtml() documentation

core/java/android/text/Html.java

@@ -137,7 +137,12 @@ public class Html {
     }
 
     /**
-     * Returns an HTML representation of the provided Spanned text.
+     * Returns an HTML representation of the provided Spanned text. A best effort is
+     * made to add HTML tags corresponding to spans. Also note that HTML metacharacters
+     * (such as "<" and "&") within the input text are escaped.
+     *
+     * @param text input text to convert
+     * @return string containing input converted to HTML
      */
     public static String toHtml(Spanned text) {
         StringBuilder out = new StringBuilder();