tree 485b152b97bf8321fdd223f35587bb4294672be8
parent 8103a941ba0c0c908d1679cf8f47965d17e7782b
parent 1e1a5d7820fdce805e3dc88031f9ba937a8e8989
author Marc Blank <mblank@google.com> 1329440063 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329440063 -0800

am 094bf51e: Use &#39; for apostrophe in HTML encoding DO NOT MERGE

* commit '094bf51ec0911057263a27db4d79db4eface2d63':
  Use &#39; for apostrophe in HTML encoding DO NOT MERGE