summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "back port upstream patch"Jean-Baptiste Queru2012-08-151-2/+3
|\
| * back port upstream patchFengwei Yin2012-08-151-2/+3
|/
* 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
* | Merge "Add MIPS architecture support"Jean-Baptiste Queru2012-08-105-1/+176
|\ \ | |/ |/|
| * Add MIPS architecture supportPaul Lind2012-08-075-1/+176
|/
* 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
|/
* Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\
| * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| |\
* | \ am 0fcb69e6: Merge "DO NOT MERGE Work around for use-after-free cert bug" int...Selim Gurun2012-06-073-31/+36
|\ \ \ | |/ /
| * | 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
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-070-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am 86e0fcf8: DO NOT MERGE Convert exit calls to abort for AndroidSelim Gurun2012-06-062-0/+40
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE Convert exit calls to abort for AndroidSelim Gurun2012-06-062-0/+40
| | |/ | |/|
| | |
| \ \
*-. \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-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
* | 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
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| | * | | | | | | | | am 92b6b8e6: Merge "fix for bug 5454586, fix up getDbThread()"Kristian Monsen2011-10-251-41/+14
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am b54fbb0d: Fix for build breakKristian Monsen2011-10-241-2/+3
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | am 9fb7297d: Part of fix for bug 5455901 Fix makefile, turn off exporting eve...Kristian Monsen2011-10-241-3/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 41543423: Part of fix for bug 5455901 Export symbols from baseKristian Monsen2011-10-245-11/+36
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am a1fe9c04: Part of fix for bug 5455901 Add exports needed for autofill and ...Kristian Monsen2011-10-247-8/+61
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 25577496: Part of fix for bug 5455901 Export symbols from net/Kristian Monsen2011-10-2429-55/+94
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am a3fef89e: Part of fix for bug 5455901 Export symbols in android/Kristian Monsen2011-10-243-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cd7ce18e: Part of fix for bug 5455901 adding net_export.hKristian Monsen2011-10-241-0/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eaa86de4: Remove temporary debug loggingSteve Block2011-10-193-74/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8d1e40fa: am c0c5e0fc: Fix SQLitePersistentCookieStore\'s getDbThread() to...Steve Block2011-10-141-12/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d980efe: am df5ec85c: Merge "Causing webviews to hang." into ics-mr0Chris Craik2011-10-131-21/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e3b44106: (-s ours) am 08712c35: (-s ours) Remove temporary debug logging ...Steve Block2011-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 47f5154a: Fix SQLitePersistentCookieStore\'s getDbThread() to be threadsafeSteve Block2011-10-131-12/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d0a07ba4: More logging in Thread to help debuggingSteve Block2011-10-102-15/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 28480d4f: Add more logging to Thread and WaitableEvent to help debuggingSteve Block2011-10-072-0/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9306e92a: Use notable values when clearing Thread::startup_data_ to help w...Steve Block2011-10-031-0/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e4aeb840: Reapply: Fix for bug 5226268 [Browser] http keep-aliveKristian Monsen2011-09-202-0/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d2fbc57a: Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-22 19:17:59 +0000