summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/13/changes
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-05-24 11:22:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-24 11:22:39 -0700
commitbc533dd3201afdcf421070cc47250dd7471b77aa (patch)
treeebaca02edb11f447fceff78ec79d80cfada6c7ea /docs/html/sdk/api_diff/13/changes
parent00bcea1ac3be490e2730d15a6406541341dd3853 (diff)
parent18a259fe37861a78632a0667d746ea7d06356ced (diff)
am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '18a259fe37861a78632a0667d746ea7d06356ced': Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/13/changes')
0 files changed, 0 insertions, 0 deletions