am 9c396a24: am 4bc74d19: Merge "Delete surrogate together."

* commit '9c396a24c9b76ad53314062776c154c48e33d046':
main
Jean Chalard 2013-09-26 05:58:46 -07:00 committed by Android Git Automerger
commit 8db45c5f18

Diff Content Not Available