| commit | 36ac304c6e62dbb1caaf729c70d7aa956aff63be | [log] [tgz] |
|---|---|---|
| author | Kristian Monsen <kristianm@google.com> | Tue May 24 11:16:39 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 24 11:16:39 2011 -0700 |
| tree | ce00c225b84cb7190ef9d46772cb329666e1cbf2 | |
| parent | 2959916b13165f56431f3993bd6b16364032af14 [diff] | |
| parent | f147b5f2a61ab0842adaa430d9a8bbe98a83e4a4 [diff] |
Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2