summaryrefslogtreecommitdiff
path: root/libs/utils/BackupHelpers.cpp
diff options
context:
space:
mode:
author Kristian Monsen <kristianm@google.com> 2011-05-24 11:16:39 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-05-24 11:16:39 -0700
commit4994521abed9afc4060741d390dc4bcbc8134ffc (patch)
treeaa39ed32eb607bb6421631722053b8d8a5bd82fa /libs/utils/BackupHelpers.cpp
parent79b4767c7b078c3379d54a102bb46bc6e10fe13f (diff)
parent643ad1de510c83610061f7c54593e0dce3517d13 (diff)
Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2
Diffstat (limited to 'libs/utils/BackupHelpers.cpp')
0 files changed, 0 insertions, 0 deletions