OSDN Git Service

am e589fc89: (-s ours) am 4079702a: Merge "Fix memory corruption issues in TextLayout...
authorJeff Brown <jeffbrown@google.com>
Tue, 6 Dec 2011 16:49:53 +0000 (08:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Dec 2011 16:49:53 +0000 (08:49 -0800)
commit441fbe0a4aa822642ab48d947bdb62a2bc867e74
treea4f7155e7d0e10895947a985fd9e447a72f9a5a0
parentdfa7dc74d96f5f8be024fa6ea56c4486c417603f
parentc18c2b28f9dece33fd6227e774cbd7760ebbf396
am e589fc89: (-s ours) am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)" into ics-mr1

* commit 'e589fc8984d2be7a8b78d78a5290c8fed014dcbd':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)