commit | 37a55130fcb617a4641bde56e3d8831d48a008aa | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 16 07:45:51 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 16 07:45:51 2011 -0800 |
tree | 5ec0f7a4624a70b2b3c72b61054b82dc2c1f0c11 | |
parent | 1c4f3c21a36345e8812fe8850ea6fd8ead23def7 [diff] | |
parent | 5cf2a1399e8cd047e84e159e25c74c259882f52c [diff] |
am 5cf2a139: am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release * commit '5cf2a1399e8cd047e84e159e25c74c259882f52c': Fix bug in TextLayoutCacheKey handling embedded nulls. DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.