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

* commit 'f6236e7e9e4caa48571ade93b0e1fb6ae2c1b8e6':
main
Jean Chalard 2013-09-26 05:58:40 -07:00 committed by Android Git Automerger
commit cd550c66df

Diff Content Not Available