summaryrefslogtreecommitdiff
path: root/libs/utils/FileMap.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2011-11-16 07:38:11 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-16 07:38:11 -0800
commitd0dc0430b4db7249f1408b9ade9f9184ec18d3f7 (patch)
tree7aa1ce39b517991db26398c62bc30253aca0f19f /libs/utils/FileMap.cpp
parentfc8c80bd724abe324ab71aaad5474d571e8d02e2 (diff)
parent48792c741570f1788c43fc00853b09b7b8724a30 (diff)
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.
Diffstat (limited to 'libs/utils/FileMap.cpp')
0 files changed, 0 insertions, 0 deletions