am 267e6179: am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."

* commit '267e61790a6d1f41ead37efd6a4045f48227ff8b':
main
Jean Chalard 2013-04-17 19:45:01 -07:00 committed by Android Git Automerger
commit 472f764f57

Diff Content Not Available