am e589fc89: (-s ours) am 4079702a: Merge "Fix memory corruption issues in...
am e589fc89: (-s ours) am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
* commit 'e589fc89':
Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)