am 59685954: (-s ours) am 1e994211: Merge "Fix TextLayoutCache issue when...
am 59685954: (-s ours) am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
* commit '59685954':
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)