am 9c5eb110: am cd550c66: am f6236e7e: am e18fdf80: Merge "Fix a bug with surrogate pairs"

* commit '9c5eb11015b41a928828cd72241aed2b24ff10d1':
This commit is contained in:
Jean Chalard 2013-10-03 12:02:29 -07:00 committed by Android Git Automerger
commit e00614f8b8

Diff content is not available