summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2e6e5ef7: (-s ours) am c391e782: (-s ours) Fix for bug 5226268 [Browser] h...Kristian Monsen2011-09-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable TLSv1.2 and TLSv1.1.Selim Gurun2012-03-281-0/+6
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Make SSL_CIPHER_get_id definition conditional on OpenSSL versionBrian Carlstrom2012-03-211-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracking openssl-1.0.1 upgradeBrian Carlstrom2012-03-161-3/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Import content and address detector supportJohn Reck2012-02-237-3/+208
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Append client parameter to AutoFill server requests.Ben Murdoch2012-02-161-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug 5152544, remove warning from chromium portKristian Monsen2011-11-222-3/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 361bc379: Merge "Enable persistent http connections." into ics-mr1Selim Gurun2011-11-171-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enable persistent http connections." into ics-mr1Selim Gurun2011-11-171-6/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Enable persistent http connections.Selim Gurun2011-11-171-6/+0
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 39ad9f56: Merge "Defer closing idle sockets." into ics-mr1Selim Gurun2011-11-173-4/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Defer closing idle sockets." into ics-mr1Selim Gurun2011-11-173-4/+132
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Defer closing idle sockets.Selim Gurun2011-11-173-4/+132
| | |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | am efe273f2: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-1510-61/+187
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | am 1ab02c36: (-s ours) Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-154-12/+65
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | am 93bed14e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-156-5/+39
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | am a972e26e: (-s ours) Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-154-22/+56
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | am 2c4085b2: Backport SPDY ping changes from chrome 16.Selim Gurun2011-11-1116-62/+1252
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Backport SPDY ping changes from chrome 16.Selim Gurun2011-11-1016-62/+1252
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5584571 Add HTTP request header with app nameKristian Monsen2011-11-091-1/+5
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-0210-61/+187
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-014-12/+65
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-016-5/+39
* | | | | | | | | | | | | | | | | | | | | Part of fix for bug 5523834, backporting cache fixesKristian Monsen2011-11-014-22/+56
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "fix for bug 5454586, fix up getDbThread()"Kristian Monsen2011-10-251-41/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | fix for bug 5454586, fix up getDbThread()Kristian Monsen2011-10-241-41/+14
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |