tree ebaca02edb11f447fceff78ec79d80cfada6c7ea
parent 00bcea1ac3be490e2730d15a6406541341dd3853
parent 18a259fe37861a78632a0667d746ea7d06356ced
author Kristian Monsen <kristianm@google.com> 1306261359 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306261359 -0700

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