9773cd73b6
Merge commit 'f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp * commit 'f470ed8630e9e648727443b065b9f1c69fee34d6': Support surrogate pairs when layouting text