| commit | 18a259fe37861a78632a0667d746ea7d06356ced | [log] [tgz] |
|---|---|---|
| author | Kristian Monsen <kristianm@google.com> | Tue May 24 11:19:00 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 24 11:19:00 2011 -0700 |
| tree | 3f9bee5f8307f2a308374df341e26d35b2be1b80 | |
| parent | dc8a53a7db91ac23d2b213dc5cf758d64bd880be [diff] | |
| parent | 36ac304c6e62dbb1caaf729c70d7aa956aff63be [diff] |
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 '36ac304c6e62dbb1caaf729c70d7aa956aff63be': Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE