summaryrefslogtreecommitdiff
path: root/libs/utils/FileMap.cpp
diff options
context:
space:
mode:
author David Brown <dab@google.com> 2011-11-17 12:35:26 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-17 12:35:26 -0800
commitc1bb1bc3645563bb86f00969031d6e0a705dce8c (patch)
tree6612a4783a0af5dacf89a520c8ea80420dc0103b /libs/utils/FileMap.cpp
parente16f48b12632b4fdc62e501167a5b228307bff7e (diff)
parent2a9e6ac3177626679969dc1f16133d09fc9f7c62 (diff)
am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1
* commit '1733a3de8c4f98ba4df08ab79d1fef6d2684d2c2': SIP addresses containing "911" shouldn't be considered emergency calls
Diffstat (limited to 'libs/utils/FileMap.cpp')
0 files changed, 0 insertions, 0 deletions