commit f5f5d61c611b6f2c699ba472972e0b5c33c82402
author The Android Open Source Project <initial-contribution@android.com> Fri Feb 17 09:02:50 2012 -0800
committer The Android Open Source Project <initial-contribution@android.com> Fri Feb 17 09:02:50 2012 -0800
tree 5c5b542f3e13f760720035eaa438cf90d8cf2b42
parent 970c74acb16529b73c03d93469472c3c3ba6af35
parent 75b223f2f816e6e95947919938ef44244cf3d454

Reconcile with ics-mr1-release

Change-Id: I04e83e00da70672ba81716c43919c489e77b14c6

core/java/android/text/TextUtils.java

diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index 95a3cdc..43dfc81 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -1325,7 +1325,11 @@
                 sb.append("&"); //$NON-NLS-1$
                 break;
             case '\'':
-                sb.append("'"); //$NON-NLS-1$
+                //http://www.w3.org/TR/xhtml1
+                // The named character reference ' (the apostrophe, U+0027) was introduced in
+                // XML 1.0 but does not appear in HTML. Authors should therefore use ' instead
+                // of ' to work as expected in HTML 4 user agents.
+                sb.append("'"); //$NON-NLS-1$
                 break;
             case '"':
                 sb.append("""); //$NON-NLS-1$