OSDN Git Service

am 020d429d: am 3bf09f77: Merge "Add PAC File support for proxy configuration"
authorJason Monk <jmonk@google.com>
Thu, 5 Dec 2013 19:28:34 +0000 (19:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 19:28:34 +0000 (19:28 +0000)
commit73f61c804c2430951c31c78dfbed9b2e4925a023
treed4c7f65d63d17434ea04029bf7be76559e30568b
parent2166b9b89098db4043457e9ac5e353a073ac710d
parent020d429dedc736a08c08b3fa702cf570a151f6fc
am 020d429d: am 3bf09f77: Merge "Add PAC File support for proxy configuration"

* commit '020d429dedc736a08c08b3fa702cf570a151f6fc':