commit | 1d55ff9fdc22ff2f0618977e8dfa6dbafa57d267 | [log] [tgz] |
---|---|---|
author | Fabrice Di Meglio <fdimeglio@google.com> | Tue Nov 01 19:42:48 2011 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 01 19:42:48 2011 +0000 |
tree | 0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4 | |
parent | 28e2117ac8dcfb02cb5746bd3bf9fbdbd974ed7f [diff] | |
parent | 33ba0be0de8ab32a1e13ebb4b1247743c462bb7d [diff] |
am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 * commit '46e327ca32a29432941ba4487077577b10243aed': Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE