tree c1805e3f7c2ea5912ff28466a4469af9bea3fb42
parent d35e94a3cbd27f08430c593930c989a36f17a833
parent 24a24b27903785dedb507b11583b70975fe9f8e4
author Victoria Lease <violets@google.com> 1383337851 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383337851 -0700

am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev

* commit '24a24b27903785dedb507b11583b70975fe9f8e4':
  Handle surrogate pairs in Html.toHtml()