| commit | 9ccfef93d7dbf5fa87c9ef7a9bb10e264953250b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 30 13:47:37 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 30 13:47:37 2010 -0700 |
| tree | 3da1d8d0a16d08bae8a68c1b9a23cd5a4a40992c | |
| parent | 02a13a9f66ff2d2311c3a1efcc5c8013d7626865 [diff] | |
| parent | cceddb59644274434c26efcd7272cb4a76c31d49 [diff] |
am 9773cd73: (-s ours) am f470ed86: Merge "Support surrogate pairs when layouting text" Merge commit '9773cd73b627c8521257c005881554d183d19a63' * commit '9773cd73b627c8521257c005881554d183d19a63': Support surrogate pairs when layouting text