| commit | 020d429dedc736a08c08b3fa702cf570a151f6fc | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Aug 08 15:54:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 08 15:54:40 2013 -0700 |
| tree | 58a1cc465321e6853dbe81e9caaaa03f3d39b1ac | |
| parent | 6888e50d2616d5ff37f9d5f20275b305dda3649a [diff] | |
| parent | 3bf09f77c2150c5d3426cf9b347e8d7a835a73c7 [diff] |
am 3bf09f77: Merge "Add PAC File support for proxy configuration" * commit '3bf09f77c2150c5d3426cf9b347e8d7a835a73c7': Add PAC File support for proxy configuration