| commit | 370a0ea3e79ba7eae9c0c00a6d9ca2e857eb178e | [log] [tgz] |
|---|---|---|
| author | Fabrice Di Meglio <fdimeglio@google.com> | Tue Dec 06 16:59:50 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 06 16:59:50 2011 -0800 |
| tree | a4f7155e7d0e10895947a985fd9e447a72f9a5a0 | |
| parent | 3717403c8dbc2de1f581f1d4f04477fc45d2be61 [diff] | |
| parent | 852ef84d0a698d411989d87542454e2cd5d1c1a6 [diff] |
am 59685954: (-s ours) am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1 * commit '596859549254a63c619fdc403e49e809751ab832': Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)