summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add tls1_1, tls1_2 settings, remove sslv3 fallback code, disable RC4HEADmasterWolfgang Wiedmeyer2015-09-276-22/+25
* Revert "net: networking optimizations"Ricardo Cerqueira2012-11-1966-3818/+162
* Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/ex...Steve Kondik2012-11-1812-7/+213
|\
| * am 5dfd2805: Merge "Null pointer check missing in chromium"Jean-Baptiste Queru2012-09-051-1/+7
| |\
| | * Merge "Null pointer check missing in chromium"Jean-Baptiste Queru2012-09-051-1/+7
| | |\
| | | * Null pointer check missing in chromiumMagnus Hallqvist2012-09-051-1/+7
| | |/
| * | Disable compression.Selim Gurun2012-08-302-0/+8
| * | am f4aee7bd: Merge "back port upstream patch"Jean-Baptiste Queru2012-08-151-2/+3
| |\ \ | | |/
| | * Merge "back port upstream patch"Jean-Baptiste Queru2012-08-151-2/+3
| | |\
| | | * back port upstream patchFengwei Yin2012-08-151-2/+3
| | |/
| * | am 1c684ed1: Merge "Fix lazy-instance template to preserve object alignment o...Jean-Baptiste Queru2012-08-101-1/+12
| |\ \ | | |/
| | * Merge "Fix lazy-instance template to preserve object alignment on MIPS."Jean-Baptiste Queru2012-08-101-1/+12
| | |\
| | | * Fix lazy-instance template to preserve object alignment on MIPS.Paul Lind2012-08-071-1/+12
| * | | am 2af13d06: Merge "Add MIPS architecture support"Jean-Baptiste Queru2012-08-105-1/+176
| |\ \ \ | | |/ /
| | * | Merge "Add MIPS architecture support"Jean-Baptiste Queru2012-08-105-1/+176
| | |\ \ | | | |/ | | |/|
| | | * Add MIPS architecture supportPaul Lind2012-08-075-1/+176
| | |/
| * | am 0abec4da: Merge "Forward-compatible fix for ucontext_t"David 'Digit' Turner2012-07-111-2/+2
| |\ \ | | |/
| | * Merge "Forward-compatible fix for ucontext_t"David 'Digit' Turner2012-07-111-2/+2
| | |\
| | | * Forward-compatible fix for ucontext_tDavid 'Digit' Turner2012-07-111-2/+2
| | |/
| * | am 2f413d82: Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
| |\ \ | | |/
| | * Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
| | |\
| * | \ am ea30d010: (-s ours) am 0fcb69e6: Merge "DO NOT MERGE Work around for use-a...Selim Gurun2012-06-070-0/+0
| |\ \ \ | | |/ /
| | * | am 0fcb69e6: Merge "DO NOT MERGE Work around for use-after-free cert bug" int...Selim Gurun2012-06-073-31/+36
| | |\ \
| * | \ \ Merge "Work around for use-after-free cert bug"Selim Gurun2012-06-073-31/+36
| |\ \ \ \
| | * | | | Work around for use-after-free cert bugJonathan Dixon2012-06-073-31/+36
| * | | | | am 99912695: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| | |\ \ \ \
| * | \ \ \ \ am c2c49272: (-s ours) am 86e0fcf8: DO NOT MERGE Convert exit calls to abort ...Selim Gurun2012-06-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 86e0fcf8: DO NOT MERGE Convert exit calls to abort for AndroidSelim Gurun2012-06-062-0/+40
| | |\ \ \ \ \
| * | | | | | | Convert exit calls to abort for AndroidSelim Gurun2012-06-052-0/+40
| | |_|_|/ / / | |/| | | | |
| * | | | | | Modify Makefile for building for ASANSelim Gurun2012-05-241-0/+5
| |/ / / / /
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | net: networking optimizationsEbrahem Qassem2012-09-1166-162/+3818
| |_|_|_|_|/ |/| | | | |
* | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-070-0/+0
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-04-300-0/+0
| | |\ \ | | | |/ | | |/|
| | | * Disable TLSv1.2 and TLSv1.1.Selim Gurun2012-03-281-0/+6
* | | | Merge "DO NOT MERGE Work around for use-after-free cert bug" into jb-devSelim Gurun2012-06-073-31/+36
|\ \ \ \ | |/ / / |/| | |
| * | | DO NOT MERGE Work around for use-after-free cert bugJonathan Dixon2012-06-073-31/+36
| |/ /
* | | DO NOT MERGE Convert exit calls to abort for AndroidSelim Gurun2012-06-062-0/+40
|/ /
* | Properly clean an exception to prevent a crashSelim Gurun2012-04-271-0/+5
* | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \
| * \ am 361bc379: Merge "Enable persistent http connections." into ics-mr1Selim Gurun2011-11-171-6/+0
| |\ \
| * \ \ am 39ad9f56: Merge "Defer closing idle sockets." into ics-mr1Selim Gurun2011-11-173-4/+132
| |\ \ \
| * \ \ \ am efe273f2: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-1710-61/+187
| |\ \ \ \
| * \ \ \ \ am 1ab02c36: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-174-12/+65
| |\ \ \ \ \
| * \ \ \ \ \ am 93bed14e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-176-5/+39
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am a972e26e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-174-22/+56
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 2c4085b2: Backport SPDY ping changes from chrome 16.Selim Gurun2011-11-1116-62/+1252
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-21 17:16:03 +0000