summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-06-08merge in jb-release history after reset to jb-devandroid-4.1_pre2android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1android-4.1-sdk_pre1jb-releasejb-mr0-releaseThe Android Automerger
2012-06-07Merge "DO NOT MERGE Work around for use-after-free cert bug" into jb-devandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devSelim Gurun
2012-06-07DO NOT MERGE Work around for use-after-free cert bugJonathan Dixon
2012-06-07merge in jb-release history after reset to jb-devThe Android Automerger
2012-06-06DO NOT MERGE Convert exit calls to abort for AndroidSelim Gurun
2012-04-30merge in jb-release history after reset to jb-devandroid-4.1_pre1The Android Automerger
2012-04-27Properly clean an exception to prevent a crashSelim Gurun
2012-04-03Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood
2012-03-28Disable TLSv1.2 and TLSv1.1.Selim Gurun
2012-03-28Disable TLSv1.2 and TLSv1.1.Selim Gurun
2012-03-21Make SSL_CIPHER_get_id definition conditional on OpenSSL versionBrian Carlstrom
2012-03-16Tracking openssl-1.0.1 upgradeBrian Carlstrom
2012-02-23Import content and address detector supportJohn Reck
2012-02-16Append client parameter to AutoFill server requests.Ben Murdoch
2011-11-22Fix for bug 5152544, remove warning from chromium portKristian Monsen
2011-11-17am 361bc379: Merge "Enable persistent http connections." into ics-mr1Selim Gurun
2011-11-17am 39ad9f56: Merge "Defer closing idle sockets." into ics-mr1Selim Gurun
2011-11-17am efe273f2: Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-17am 1ab02c36: (-s ours) Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-17am 93bed14e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-17am a972e26e: (-s ours) Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-17am 361bc379: Merge "Enable persistent http connections." into ics-mr1android-4.0.4-aah_r1ics-aah-releaseSelim Gurun
2011-11-17am 39ad9f56: Merge "Defer closing idle sockets." into ics-mr1Selim Gurun
2011-11-17Merge "Enable persistent http connections." into ics-mr1android-sdk-adt_r20android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-3.2.6_r1tools_r20ics-mr1-releaseSelim Gurun
2011-11-17Merge "Defer closing idle sockets." into ics-mr1Selim Gurun
2011-11-17Enable persistent http connections.Selim Gurun
2011-11-17Defer closing idle sockets.Selim Gurun
2011-11-17am efe273f2: Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-17am 1ab02c36: Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-17am 93bed14e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-17am a972e26e: Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-15Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-15Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-15Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-15Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-11am 2c4085b2: Backport SPDY ping changes from chrome 16.Selim Gurun
2011-11-11am 2c4085b2: Backport SPDY ping changes from chrome 16.Selim Gurun
2011-11-10Backport SPDY ping changes from chrome 16.Selim Gurun
2011-11-09Part of fix for bug 5584571 Add HTTP request header with app nameKristian Monsen
2011-11-02Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-01Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-01Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-11-01Part of fix for bug 5523834, backporting cache fixesKristian Monsen
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-10-25am 92b6b8e6: Merge "fix for bug 5454586, fix up getDbThread()"Kristian Monsen
2011-10-25Merge "fix for bug 5454586, fix up getDbThread()"Kristian Monsen
2011-10-24fix for bug 5454586, fix up getDbThread()Kristian Monsen
2011-10-24am b54fbb0d: Fix for build breakKristian Monsen