summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/Proxy.java
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of b3ffd4ad to masterBrad Fitzpatrick2010-10-111-6/+6
|\
| * Don't perform DNS lookup in android.net.Proxy.isLocalHostAndreas Sandblad2010-10-041-8/+6
| * Fix build.Jean-Baptiste Queru2010-07-161-6/+1
* | Enhance http proxy supportRobert Greenwalt2010-09-171-102/+124
* | Some cleanup of Proxy class.Robert Greenwalt2010-09-031-5/+8
* | Fix for bug 2890320 Browser crashes, after adding bookmark.Oscar Montemayor2010-08-051-23/+13
* | Fix for bug 2890320 Browser crashes, after adding bookmark.Oscar Montemayor2010-08-041-18/+31
* | Global Proxy changes to proxy class.Oscar Montemayor2010-08-021-56/+310
* | Fix build.Jean-Baptiste Queru2010-07-161-6/+1
|/
* Added method getPreferredHttpHostAndreas Sandblad2010-07-141-0/+80
* Remove references to android.util.ConfigDave Bort2009-04-091-3/+6
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+120
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-120/+0
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-4/+4
* Initial ContributionThe Android Open Source Project2008-10-211-0/+120