| commit | e1bf163c1e6e997e30c0e89f68569d52d22b9c46 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Aug 21 00:58:26 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 20 20:15:45 2014 +0000 |
| tree | 1424feeaa0453207e19a94c6ada7b05b5cd63959 | |
| parent | e02f340d9a0c4f841376c3db8ec93f65e7e58417 [diff] | |
| parent | 4385af32eff1b99802e6ce233a2b10d002bf4eb1 [diff] |
Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev