tree 7d3267977c3992c7627ec72a3223dc010bbaa88e
parent c3e8bddecf423bcb7c68b44acdf962ed1b9839b6
parent db7dc9cc892dc6fb57f1a4a178c45bcb6437f821
author Andreas Huber <andih@google.com> 1299710532 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1299710532 -0800

Merge "Use the same http proxy mechanism that webkit uses instead of bypassing proxies."