Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7636e96 authored by Kristian Monsen's avatar Kristian Monsen Committed by Android Git Automerger
Browse files

am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic... 

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
parents ea4384a2 3493a191

There are no changes