am 89630ec8: Merge "ClipData: html attribute values should always be escaped" into jb-mr1-dev

* commit '89630ec8777804b728c50caeb1ae6fcf810e435f':
  ClipData: html attribute values should always be escaped

core/java/android/content/ClipData.java

@@ -563,7 +563,7 @@ public class ClipData implements Parcelable {
         private String uriToHtml(String uri) {
             StringBuilder builder = new StringBuilder(256);
             builder.append("<a href=\"");
-            builder.append(uri);
+            builder.append(Html.escapeHtml(uri));
             builder.append("\">");
             builder.append(Html.escapeHtml(uri));
             builder.append("</a>");