| commit | f7636e9668f82b6484a0a2b309df9b664c7f6d70 | [log] [tgz] |
|---|---|---|
| author | Kristian Monsen <kristianm@google.com> | Tue May 24 11:22:39 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 24 11:22:39 2011 -0700 |
| tree | 5a2e56885bf320a464e6b7c4e3f13f68f0f03f59 | |
| parent | ea4384a2e631837e17b717a33cd698af2b26cf7f [diff] | |
| parent | 3493a191b0535b4b79bf128794ca74022219c71e [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