commit c79f9bba0a73c75478892dd573c0af853ec9ed20
author C. Sean Young <csyoung@google.com> Mon Jun 15 15:48:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 15 15:48:07 2015 +0000
tree b552c15dbe3f0d8101867789317c0478b5b431e6
parent 161ce0bd1c2e782b501e253481d3d69af11f5cf1
parent 9647be429b6b4564dc7b38aca526791a72a1866d

am 9647be42: am 0ec3764e: Fix a bug where \' (apostrophe/single quote) was being escaped with &pos instead of the correct &apos.

* commit '9647be429b6b4564dc7b38aca526791a72a1866d':
  Fix a bug where ' (apostrophe/single quote) was being escaped with &pos instead of the correct &apos.

src/com/google/doclava/Stubs.java

diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java
index 5ae1dd0..fa82802 100644
--- a/src/com/google/doclava/Stubs.java
+++ b/src/com/google/doclava/Stubs.java
@@ -1104,7 +1104,7 @@
     returnString = returnString.replaceAll("<", "&lt;");
     returnString = returnString.replaceAll(">", "&gt;");
     returnString = returnString.replaceAll("\"", "&quot;");
-    returnString = returnString.replaceAll("'", "&pos;");
+    returnString = returnString.replaceAll("'", "&apos;");
     return returnString;
   }