tree b552c15dbe3f0d8101867789317c0478b5b431e6
parent 161ce0bd1c2e782b501e253481d3d69af11f5cf1
parent 9647be429b6b4564dc7b38aca526791a72a1866d
author C. Sean Young <csyoung@google.com> 1434383287 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434383287 +0000

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.