summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | manual merge - fix buildJean-Baptiste Queru2010-08-183-4/+11
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 166ed46d: Cherry picking changes from dalvik-devBrian Carlstrom2010-08-184-41/+11
| |\ \ \ | | |/ /
| | * | Cherry picking changes from dalvik-devBrian Carlstrom2010-08-185-42/+12
| | | * am 3b74bc0a: am 301b1df2: am 9340bb2a: Fixed problem using HTTPS with Apache ...Andreas Sandblad2010-07-301-1/+1
| | | |\ | |_|_|/ |/| | |
* | | | am 301b1df2: am 9340bb2a: Fixed problem using HTTPS with Apache HTTP Client w...Andreas Sandblad2010-07-301-1/+1
|\ \ \ \ | |/ / /
| * | | am 9340bb2a: Fixed problem using HTTPS with Apache HTTP Client when using proxyAndreas Sandblad2010-07-301-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fixed problem using HTTPS with Apache HTTP Client when using proxyAndreas Sandblad2010-07-131-1/+1
| | | * am 18a021c6: am 3cb0a125: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-190-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | am 3cb0a125: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-163-0/+29
|\ \ \ \ | |/ / /
| * | | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-163-0/+29
| |/ /
| | * am 5648c97b: Remove explicit SSLSocket.startHandshakeBrian Carlstrom2010-07-191-37/+0
| | |\ | |_|/ |/| |
* | | Remove explicit SSLSocket.startHandshakeBrian Carlstrom2010-05-051-37/+0
|/ /
| * add meta-files about 3rd party projectsThe Android Open Source Project2010-07-193-0/+29
| * Turning off expect-continue by default in Apache HTTP client.Jesse Wilson2010-05-061-1/+8
| * RFC2616 says it's "100-continue", not "100-Continue".Elliott Hughes2010-04-282-3/+3
|/
* b/2599994 Should call prepareSocket on underlying socket, not layered socketBrian Carlstrom2010-04-181-2/+12
* Merge "Implement proper multihoming support, second attempt."Dan Egnor2010-03-092-12/+54
|\
| * Implement proper multihoming support, second attempt.Steinar H. Gunderson2010-03-052-12/+54
* | Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
* | Fix lineFromReadBuffer() so it no longer tries to skip backwardsDan Bornstein2010-03-051-1/+5
|/
* Revert "Implement proper multihoming support, so if one server fails for what...Kenny Root2010-02-262-34/+16
* Implement proper multihoming support, so if one server fails for whatever reasonSteinar H. Gunderson2010-02-262-16/+34
* am c5718a3d: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
| * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | |\ | |/ /
| | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-120-0/+0
* | | merge from open-source masterJean-Baptiste Queru2009-09-040-0/+0
|\ \ \ | |/ / |/| |
| * | merge from donutJean-Baptiste Queru2009-09-032-0/+193
| |\ \ | | |/
* | | am 58fb7313: Add license-related filesJean-Baptiste Queru2009-08-182-0/+193
|\ \ \ | |/ / |/| / | |/
| * Add license-related filesJean-Baptiste Queru2009-08-172-0/+193
* | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\ \ | |/
* | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ | |/ |/|
| * Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2009-03-181-0/+13
| |\ | |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03431-0/+60872
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03431-60859/+0
* | auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-13/+0
* | auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-0/+13
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-170-0/+0
* Initial ContributionThe Android Open Source Project2008-10-21431-0/+60859
generated by cgit v1.1 at 2024-12-22 07:02:17 +0000