| a628b56b8b7c7f9a8730b0e43c6e04fcf3619b7e |
|
05-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Compile fix in android proxy
Functions changed upstream:
http://src.chromium.org/viewvc/chrome/branches/742/src/net/proxy/proxy_config_service.h?view=diff&pathrev=88489&r1=81084&r2=81085
Change-Id: Id420fe2cab4d27f0bc75543bd00a8089f5e6551c
/external/chromium/net/proxy/proxy_config_service_android.cc
|
| eae0084084f68c82733e5d9d4dea8e14eba66cc9 |
|
23-May-2011 |
Kristian Monsen <kristianm@google.com> |
Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy
Adding blacklist handling to chromium. Splitting the string around
"," for several entries. To blacklist all subdomains use *,
f.ex. *cnn.com.
Needs CL in external/webkit:
https://android-git.corp.google.com/g/#change,112401
Needs CL in frameworks/base:
https://android-git.corp.google.com/g/#change,112400
Change-Id: Ifbbb499bc4cb4da2d63e3ca4d56e6395ad747afc
/external/chromium/net/proxy/proxy_config_service_android.cc
|
| 01ba86dc3bae37426ebafbdd93640dc50c45e3e0 |
|
14-Dec-2010 |
Kristian Monsen <kristianm@google.com> |
Initial proxy support for Android
This is for starting work on bug 3274564
Change-Id: I053f41f75cd514546ac876533eb5ae202baffa70
/external/chromium/net/proxy/proxy_config_service_android.cc
|