am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."

* commit '3b9d7fd1792da09c1d436eceb49ee4ea6bc47f07':
main
Jean Chalard 2013-04-03 19:31:31 -07:00 committed by Android Git Automerger
commit c821c723b8

Diff Content Not Available