| commit | d20f09ab3b0e06a17c9cc91e7b2d9cc2f5e033a1 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Aug 21 01:15:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 01:15:08 2014 +0000 |
| tree | cced8e0cad277e6a79fcf861e18d884e3e80dd4f | |
| parent | aacaa1735ce6906614016ba4b8719c157084aa75 [diff] | |
| parent | e1bf163c1e6e997e30c0e89f68569d52d22b9c46 [diff] |
am 45959a5e: Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev * commit '45959a5e4f0eb42e1e18cd563a9cf56d5c9dd65b': Fix SOCKS proxies from being dropped from PAC