am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release

Browse Source

* commit 'c172688d5e9a1d26e2792297939cbb7bd93acaf2':
  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.

...

This commit is contained in:

The Android Open Source Project

2011-11-16 07:42:14 -08:00

committed by Android Git Automerger

parent 862c2f5275 c172688d5e

commit 5cf2a1399e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available