tree c89affb2740cf04908d85a85f2a1ecd13ae56888
parent 4846a93b55d7c8bf1af78cbeb3389801cff28e99
parent 3d4764159c78857bbd3305f4fa9c11c70e742d88
author Victoria Lease <violets@google.com> 1383337361 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383337362 +0000

Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev