summaryrefslogtreecommitdiff
path: root/libs/utils/FileMap.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-09-30 10:10:52 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-30 10:10:52 -0700
commiteced15c440a8d3d71c6be37ee45a83b02821acf8 (patch)
tree98c2aa54138fd908e08466ccfb8567ddb09e10bf /libs/utils/FileMap.cpp
parent52dd08bb76fa2673bb836e38ace604af655cc2cd (diff)
parent263ab1cd7d53d90ed80a2d87a96f7724ca9768f5 (diff)
am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
Merge commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6' into gingerbread-plus-aosp * commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6': Add uri field to SipManager.ListenerRelay
Diffstat (limited to 'libs/utils/FileMap.cpp')
0 files changed, 0 insertions, 0 deletions