am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in...
am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit '46e327ca':
Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE