tree 8ac287d18cc52454bbf46b29889b27486a0dff14
parent 1db7eeac74d1455991e1dc0f532b47276d0c679c
parent 094bf51ec0911057263a27db4d79db4eface2d63
author Marc Blank <mblank@google.com> 1329440081 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329440081 -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