summaryrefslogtreecommitdiff
path: root/libs/utils/FileMap.cpp
diff options
context:
space:
mode:
author Chung-yih Wang <cywang@google.com> 2010-09-23 16:40:09 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-23 16:40:09 -0700
commit816ff9b828c3804d08b78672b563627ade705b76 (patch)
treed8edf6124d84ea83998f22a8e766e58fdfde6af4 /libs/utils/FileMap.cpp
parent1a4c979cd7b9b2a81cc4a8b36ec0e421bea238bc (diff)
parentd03ee8731e339cf8aded7073d54c876c62f77d47 (diff)
am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread
Merge commit 'f43ac911379c15b6a1a240a931b0f3cbfb2fae53' into gingerbread-plus-aosp * commit 'f43ac911379c15b6a1a240a931b0f3cbfb2fae53': Handle OPTIONS requests from SIP servers.
Diffstat (limited to 'libs/utils/FileMap.cpp')
0 files changed, 0 insertions, 0 deletions