Commits
The Android Open Source Project authored and Android Git Automerger committed c172688d5e9M
am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release * commit 'c7403258528a08ab74f7c29277d0c34ba6edc53d': 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.
Showing diff to0f2dec50339