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:42:14 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-16 07:42:14 -0800
commit72a5a247c2a36db7f2c2df9a542c42cb677e82e2 (patch)
tree5665b392bebc595ee76fd64f6469614b51588efb /libs/utils/FileMap.cpp
parent36d12fc1bd0a758386beb44372178c2144e6b224 (diff)
parentd0dc0430b4db7249f1408b9ade9f9184ec18d3f7 (diff)
am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* 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.
Diffstat (limited to 'libs/utils/FileMap.cpp')
0 files changed, 0 insertions, 0 deletions