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

* commit 'cd550c66df36d316e7056c8662c8a8ba562b5d08':
main
Jean Chalard 2013-09-26 07:53:17 -07:00 committed by Android Git Automerger
commit 9c5eb11015

Diff Content Not Available