)]}' { "log": [ { "commit": "db1b8993439cc1b0f741735e15d72a8cd67a6752", "tree": "396a4bc17c30655c78fd62fe34778900c40a97cc", "parents": [ "de6c9f9aec5e2e7e66cb77140f7418fc29644ef0", "5dfd28055043f52c8089d2b26e101de1f66838c8" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Sep 05 12:14:36 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 05 12:14:36 2012 -0700" }, "message": "am 5dfd2805: Merge \"Null pointer check missing in chromium\"\n\n* commit \u00275dfd28055043f52c8089d2b26e101de1f66838c8\u0027:\n Null pointer check missing in chromium\n" }, { "commit": "5dfd28055043f52c8089d2b26e101de1f66838c8", "tree": "bdb2eef591889d3387014a656b346a188486eb86", "parents": [ "f4aee7bd601621d648044a0f918247fd81b6190a", "a7f1721675b8b6e0389732f1e25788012f7c20b7" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Sep 05 11:41:18 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 05 11:41:18 2012 -0700" }, "message": "Merge \"Null pointer check missing in chromium\"" }, { "commit": "a7f1721675b8b6e0389732f1e25788012f7c20b7", "tree": "bdb2eef591889d3387014a656b346a188486eb86", "parents": [ "f4aee7bd601621d648044a0f918247fd81b6190a" ], "author": { "name": "Magnus Hallqvist", "email": "magnus.hallqvist@sonyericsson.com", "time": "Tue Jan 17 09:58:24 2012 +0100" }, "committer": { "name": "Kenneth Andersson", "email": "kenneth.andersson@sonymobile.com", "time": "Wed Sep 05 09:34:59 2012 +0200" }, "message": "Null pointer check missing in chromium\n\nWhen clearing a struct a null pointer check is missing in one\nlocation in chromium.\nThe null check is present in another similar use cases.\n\nWhen the backend cache is reset a member of the struct data_\n is set to zero before data_ itself is set to null. If the\nbackend cache previously has been reset data_ will already\nbe null and the member cannot be accessed\n(or uses undefined memory). The added null check will prevent\nthe clearing of the member variable when data_ is already null.\n\nChange-Id: I475fea7436c871c2e82b841a93874e13a05161f4\n" }, { "commit": "de6c9f9aec5e2e7e66cb77140f7418fc29644ef0", "tree": "7655ced956d451ac75497a16b236d0d8cc4a58fd", "parents": [ "d86dab44ce64d82d56d745e7f21d0c8eb4250496" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Aug 30 12:40:10 2012 -0700" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Aug 30 13:17:29 2012 -0700" }, "message": "Disable compression.\n\nBug: 7079965\n\nChange-Id: I6d5ac7d90fc2298b5e8a92cfae1ffb840016b88b\n" }, { "commit": "d86dab44ce64d82d56d745e7f21d0c8eb4250496", "tree": "85e7728d38fba2dd8991d869a1729c0e9d18abba", "parents": [ "a0a2f0c6fa125ca3594282f6fdb0e40d8adcbf8b", "f4aee7bd601621d648044a0f918247fd81b6190a" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Aug 15 11:23:21 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 15 11:23:21 2012 -0700" }, "message": "am f4aee7bd: Merge \"back port upstream patch\"\n\n* commit \u0027f4aee7bd601621d648044a0f918247fd81b6190a\u0027:\n back port upstream patch\n" }, { "commit": "f4aee7bd601621d648044a0f918247fd81b6190a", "tree": "5caa522ea6cc15a144382cf80455b8fa8e1f105b", "parents": [ "1c684ed1b5ac92ae473db5718627405367eb1766", "c2cbc7df84951541b29200c3a6ade3163fb815ae" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Aug 15 11:07:33 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 15 11:07:34 2012 -0700" }, "message": "Merge \"back port upstream patch\"" }, { "commit": "c2cbc7df84951541b29200c3a6ade3163fb815ae", "tree": "5caa522ea6cc15a144382cf80455b8fa8e1f105b", "parents": [ "1c684ed1b5ac92ae473db5718627405367eb1766" ], "author": { "name": "Fengwei Yin", "email": "fengwei.yin@intel.com", "time": "Thu May 24 16:47:48 2012 +0800" }, "committer": { "name": "Shuo Gao", "email": "shuo.gao@intel.com", "time": "Wed Aug 15 10:40:58 2012 +0800" }, "message": "back port upstream patch\n\nThis patch is from Chromium project. It\u0027s used to handle potential issue\nin scoped_refptr.\n\nThis is upstream patch porting and the original link is:\nhttp://codereview.chromium.org/9021020/\nunittest change was not included.\n\nChange-Id: I14ce3df0653ff29713f38eceaf07e9b409cfaedc\nAuthor: Fengwei Yin \u003cfengwei.yin@intel.com\u003e\nSinged-off-by: Shuo Gao \u003cshuo.gao@intel.com\u003e\nSigned-off-by: Bruce Beare \u003cbruce.j.beare@intel.com\u003e\nSigned-off-by: Jack Ren \u003cjack.ren@intel.com\u003e\nAuthor-tracking-BZ: 37500\n" }, { "commit": "a0a2f0c6fa125ca3594282f6fdb0e40d8adcbf8b", "tree": "549fd7fbd3bd45849de5fa622ab6a3a61c7537de", "parents": [ "e20b4bd98d879307e535cec7d6c8ac670acfaa79", "1c684ed1b5ac92ae473db5718627405367eb1766" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 12:48:57 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 10 12:48:57 2012 -0700" }, "message": "am 1c684ed1: Merge \"Fix lazy-instance template to preserve object alignment on MIPS.\"\n\n* commit \u00271c684ed1b5ac92ae473db5718627405367eb1766\u0027:\n Fix lazy-instance template to preserve object alignment on MIPS.\n" }, { "commit": "e20b4bd98d879307e535cec7d6c8ac670acfaa79", "tree": "746b7fc610eeb9f56bb9494e39f69927e3562e52", "parents": [ "cca3c6afa2152260d795e4d8802080b67c96c7ea", "2af13d061b168f46912c78a76f20bc3956422ca5" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 12:48:56 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 10 12:48:56 2012 -0700" }, "message": "am 2af13d06: Merge \"Add MIPS architecture support\"\n\n* commit \u00272af13d061b168f46912c78a76f20bc3956422ca5\u0027:\n Add MIPS architecture support\n" }, { "commit": "1c684ed1b5ac92ae473db5718627405367eb1766", "tree": "c7ad0ca557206bd855dd15f79b79f86a5f33fde6", "parents": [ "2af13d061b168f46912c78a76f20bc3956422ca5", "5dd41b50fc7d24c103522171ec2b3b89b7c0d37f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 09:42:09 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 10 09:42:09 2012 -0700" }, "message": "Merge \"Fix lazy-instance template to preserve object alignment on MIPS.\"" }, { "commit": "2af13d061b168f46912c78a76f20bc3956422ca5", "tree": "f6682b377e296999108989b1519c8de5672b96b1", "parents": [ "0abec4daa38319f371ac6555e7887f6b14f34291", "7dd039766e8bea164f5e14cb9ab26c59d3b9a5bd" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 09:26:28 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 10 09:26:28 2012 -0700" }, "message": "Merge \"Add MIPS architecture support\"" }, { "commit": "5dd41b50fc7d24c103522171ec2b3b89b7c0d37f", "tree": "87925b2b746c804e1615bf7de1b0c8c7f83e8a11", "parents": [ "0abec4daa38319f371ac6555e7887f6b14f34291" ], "author": { "name": "Paul Lind", "email": "plind@mips.com", "time": "Tue Aug 07 22:27:52 2012 -0700" }, "committer": { "name": "Paul Lind", "email": "plind@mips.com", "time": "Tue Aug 07 22:27:52 2012 -0700" }, "message": "Fix lazy-instance template to preserve object alignment on MIPS.\n\nThe alignment attribute of an object was discarded when allocating storage\nfor the lazy-instance. Alignment is important for MIPS, where doubles\n(and objects containing them) must be aligned on 8-byte boundary.\n\nThe alignment attributes are included via a macro that is only defined\nunder GCC, so that this change does not affect other build enviromments.\n\nChange-Id: I99047cf610618de2e7e29e5de85835dc45d99231\nSigned-off-by: Paul Lind \u003cplind@mips.com\u003e\n" }, { "commit": "7dd039766e8bea164f5e14cb9ab26c59d3b9a5bd", "tree": "f6682b377e296999108989b1519c8de5672b96b1", "parents": [ "0abec4daa38319f371ac6555e7887f6b14f34291" ], "author": { "name": "Paul Lind", "email": "plind@mips.com", "time": "Fri Aug 03 08:54:28 2012 -0700" }, "committer": { "name": "Paul Lind", "email": "plind@mips.com", "time": "Tue Aug 07 10:27:50 2012 -0700" }, "message": "Add MIPS architecture support\n\nChange-Id: Id2c3f41edee0e1c73cb084666533802bcf117876\nSigned-off-by: Douglas Leung \u003cdouglas@mips.com\u003e\nSigned-off-by: Chris Dearman \u003cchris@mips.com\u003e\n" }, { "commit": "cca3c6afa2152260d795e4d8802080b67c96c7ea", "tree": "3cd5590ba241fb23b73a67bda3d6e3b51dfbb03c", "parents": [ "4f8af207ba6cb1985dc9ad3e7600c7d2b4b7ecf4", "0abec4daa38319f371ac6555e7887f6b14f34291" ], "author": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Wed Jul 11 10:52:18 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 11 10:52:18 2012 -0700" }, "message": "am 0abec4da: Merge \"Forward-compatible fix for ucontext_t\"\n\n* commit \u00270abec4daa38319f371ac6555e7887f6b14f34291\u0027:\n Forward-compatible fix for ucontext_t\n" }, { "commit": "0abec4daa38319f371ac6555e7887f6b14f34291", "tree": "d078a41ba588ece7f429ec50eeef48e0de068eb1", "parents": [ "2f413d82e2541002b7f9507ad66d341d130f80e1", "516fd388674362c6fb2de59340b85f3d92ea32d8" ], "author": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Wed Jul 11 10:22:48 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 11 10:22:48 2012 -0700" }, "message": "Merge \"Forward-compatible fix for ucontext_t\"" }, { "commit": "516fd388674362c6fb2de59340b85f3d92ea32d8", "tree": "d078a41ba588ece7f429ec50eeef48e0de068eb1", "parents": [ "2f413d82e2541002b7f9507ad66d341d130f80e1" ], "author": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Wed Jul 11 18:07:43 2012 +0200" }, "committer": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Wed Jul 11 18:09:43 2012 +0200" }, "message": "Forward-compatible fix for ucontext_t\n\nThe Android C library \u003csignal.h\u003e will soon be modified to declare\nucontext_t in \u003csignal.h\u003e. To avoid conflicts when this happens, only\ndefine the type when needed.\n\nSee b/issue?id\u003d2189142\n\nChange-Id: I297b8e6f9fba8fb99c5f799b0d7e7f4dbda914bb\n" }, { "commit": "4f8af207ba6cb1985dc9ad3e7600c7d2b4b7ecf4", "tree": "b9b5b546a9222871f6c7063292767ba3d3003561", "parents": [ "2f13c2d0f9cbf8b9d14d9a08a5d91fd3c88439f7", "2f413d82e2541002b7f9507ad66d341d130f80e1" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jun 11 09:23:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 11 09:23:13 2012 -0700" }, "message": "am 2f413d82: Reconcile with jb-release\n\n* commit \u00272f413d82e2541002b7f9507ad66d341d130f80e1\u0027:\n" }, { "commit": "2f413d82e2541002b7f9507ad66d341d130f80e1", "tree": "7770a65b955938993845ea0b827e4428e9899626", "parents": [ "ea30d01040ba3e7119f24f8a15632c929b93e6d5", "a75b259c30d54752a0d42804631bcf309b381f90" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jun 11 09:20:45 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jun 11 09:20:45 2012 -0700" }, "message": "Reconcile with jb-release\n\nChange-Id: Ib0777e5e7794dec80266a4c25946b267d316f527\n" }, { "commit": "a75b259c30d54752a0d42804631bcf309b381f90", "tree": "7770a65b955938993845ea0b827e4428e9899626", "parents": [ "0fcb69e6703c52ab000dee698d4c07d19eeefee9", "2c807d29a09bca625b0847d78a342e12b9e4c14e" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Jun 08 08:17:15 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Jun 08 08:17:15 2012 -0700" }, "message": "merge in jb-release history after reset to jb-dev\n" }, { "commit": "2f13c2d0f9cbf8b9d14d9a08a5d91fd3c88439f7", "tree": "b9b5b546a9222871f6c7063292767ba3d3003561", "parents": [ "0b9f2158414813de329a23082565a22d2cdfec83", "ea30d01040ba3e7119f24f8a15632c929b93e6d5" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Jun 07 13:57:00 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 07 13:57:00 2012 -0700" }, "message": "am ea30d010: (-s ours) am 0fcb69e6: Merge \"DO NOT MERGE Work around for use-after-free cert bug\" into jb-dev\n\n* commit \u0027ea30d01040ba3e7119f24f8a15632c929b93e6d5\u0027:\n DO NOT MERGE Work around for use-after-free cert bug\n" }, { "commit": "ea30d01040ba3e7119f24f8a15632c929b93e6d5", "tree": "7770a65b955938993845ea0b827e4428e9899626", "parents": [ "99912695a49365b7caa3586656e8fa68eb0bcd33", "0fcb69e6703c52ab000dee698d4c07d19eeefee9" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Jun 07 13:39:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 07 13:39:04 2012 -0700" }, "message": "am 0fcb69e6: Merge \"DO NOT MERGE Work around for use-after-free cert bug\" into jb-dev\n\n* commit \u00270fcb69e6703c52ab000dee698d4c07d19eeefee9\u0027:\n DO NOT MERGE Work around for use-after-free cert bug\n" }, { "commit": "0fcb69e6703c52ab000dee698d4c07d19eeefee9", "tree": "7770a65b955938993845ea0b827e4428e9899626", "parents": [ "86e0fcf830dcbada802ea2de22904e912dda5384", "4534048b09d2d4a879d426d569e5ad6139b6299b" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Jun 07 13:36:19 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 07 13:36:19 2012 -0700" }, "message": "Merge \"DO NOT MERGE Work around for use-after-free cert bug\" into jb-dev" }, { "commit": "4534048b09d2d4a879d426d569e5ad6139b6299b", "tree": "d8e421c3a4482866330db5fedde5af99c6c392fb", "parents": [ "4f8351323b84a7b8c3275e6df8a99a4738fabf45" ], "author": { "name": "Jonathan Dixon", "email": "joth@google.com", "time": "Wed Jun 06 17:47:18 2012 -0700" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Jun 07 11:17:15 2012 -0700" }, "message": "DO NOT MERGE Work around for use-after-free cert bug\n\nCherry pick from master, SHA:\n 95b2bad159f2dbca0555e82f156db8424b75c2b8\n\nHolds a strong references in the cert cache.\nThis is a simpler alternative to full backport of upstream fix,\nfrom http://crrev.com/92977 -- see bug for more details.\n\nBUG: 6508448\nChange-Id: Ic8182c267653216bbcafe466ecfe1951bf6a292a\n" }, { "commit": "0b9f2158414813de329a23082565a22d2cdfec83", "tree": "b9b5b546a9222871f6c7063292767ba3d3003561", "parents": [ "3f477ddb927c67ff6cad691b816a5fb2e9b45672", "95b2bad159f2dbca0555e82f156db8424b75c2b8" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Jun 07 11:11:38 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 07 11:11:38 2012 -0700" }, "message": "Merge \"Work around for use-after-free cert bug\"" }, { "commit": "95b2bad159f2dbca0555e82f156db8424b75c2b8", "tree": "110e6573035af6678ad5c924d1e21a8285f6b917", "parents": [ "f4dca79bcaa251f18d504a81766e3f5a6397ba43" ], "author": { "name": "Jonathan Dixon", "email": "joth@google.com", "time": "Wed Jun 06 17:47:18 2012 -0700" }, "committer": { "name": "Jonathan Dixon", "email": "joth@google.com", "time": "Thu Jun 07 10:39:44 2012 -0700" }, "message": "Work around for use-after-free cert bug\n\nHolds a strong references in the cert cache.\nThis is a simpler alternative to full backport of upstream fix,\nfrom http://crrev.com/92977 -- see bug for more details.\n\nBUG: 6508448\n\nChange-Id: Ib47ca2e33b9e43ac47baf645069ecaab257ec74a\n" }, { "commit": "3f477ddb927c67ff6cad691b816a5fb2e9b45672", "tree": "968ca861966ba04b3ff1b7aff253d3ef71eddc4d", "parents": [ "3cc6a72f40172e40a931c2cc7138839d0cf1aed7", "99912695a49365b7caa3586656e8fa68eb0bcd33" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Jun 07 07:52:02 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 07 07:52:02 2012 -0700" }, "message": "am 99912695: Reconcile with jb-release\n\n* commit \u002799912695a49365b7caa3586656e8fa68eb0bcd33\u0027:\n" }, { "commit": "99912695a49365b7caa3586656e8fa68eb0bcd33", "tree": "70cbd98be2fe6481feecf9cee18db8845aa9f32b", "parents": [ "c2c49272a8d186f5abd688836f1deaaf06865f9d", "2c807d29a09bca625b0847d78a342e12b9e4c14e" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Jun 07 07:48:57 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Jun 07 07:48:57 2012 -0700" }, "message": "Reconcile with jb-release\n\nChange-Id: I39749f27bd2911551a009fed4a3ed045a5e6eb12\n" }, { "commit": "2c807d29a09bca625b0847d78a342e12b9e4c14e", "tree": "70cbd98be2fe6481feecf9cee18db8845aa9f32b", "parents": [ "86e0fcf830dcbada802ea2de22904e912dda5384", "5ba1edeaf0a7895f2975d37c5002677d86a8f837" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Jun 07 07:00:28 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Jun 07 07:00:28 2012 -0700" }, "message": "merge in jb-release history after reset to jb-dev\n" }, { "commit": "3cc6a72f40172e40a931c2cc7138839d0cf1aed7", "tree": "968ca861966ba04b3ff1b7aff253d3ef71eddc4d", "parents": [ "edec5f424996d4a532ba6fdb2203c06a02887606", "c2c49272a8d186f5abd688836f1deaaf06865f9d" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Wed Jun 06 11:18:52 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 06 11:18:52 2012 -0700" }, "message": "am c2c49272: (-s ours) am 86e0fcf8: DO NOT MERGE Convert exit calls to abort for Android\n\n* commit \u0027c2c49272a8d186f5abd688836f1deaaf06865f9d\u0027:\n DO NOT MERGE Convert exit calls to abort for Android\n" }, { "commit": "c2c49272a8d186f5abd688836f1deaaf06865f9d", "tree": "70cbd98be2fe6481feecf9cee18db8845aa9f32b", "parents": [ "27d9d3d22e980342fe7a2ab18777b59ad5e04a15", "86e0fcf830dcbada802ea2de22904e912dda5384" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Wed Jun 06 11:16:22 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 06 11:16:22 2012 -0700" }, "message": "am 86e0fcf8: DO NOT MERGE Convert exit calls to abort for Android\n\n* commit \u002786e0fcf830dcbada802ea2de22904e912dda5384\u0027:\n DO NOT MERGE Convert exit calls to abort for Android\n" }, { "commit": "86e0fcf830dcbada802ea2de22904e912dda5384", "tree": "70cbd98be2fe6481feecf9cee18db8845aa9f32b", "parents": [ "4f8351323b84a7b8c3275e6df8a99a4738fabf45" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Tue Jun 05 18:18:30 2012 -0700" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Wed Jun 06 10:10:55 2012 -0700" }, "message": "DO NOT MERGE Convert exit calls to abort for Android\n\nBug: 6603427\n\nCherry picking from master to jb-dev. Sha:\n edec5f424996d4a532ba6fdb2203c06a02887606\nThis is to track some silent failures happening in mediaserver.\n\nChange-Id: I9345cee5e0137b723fd5a2b7c787c235af4462b8\n" }, { "commit": "edec5f424996d4a532ba6fdb2203c06a02887606", "tree": "968ca861966ba04b3ff1b7aff253d3ef71eddc4d", "parents": [ "f4dca79bcaa251f18d504a81766e3f5a6397ba43" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Tue Jun 05 18:18:30 2012 -0700" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Tue Jun 05 18:18:30 2012 -0700" }, "message": "Convert exit calls to abort for Android\n\nBug: 6603427\n\nThis is to track some silent failures happening in mediaserver.\n\nChange-Id: I9345cee5e0137b723fd5a2b7c787c235af4462b8\n" }, { "commit": "f4dca79bcaa251f18d504a81766e3f5a6397ba43", "tree": "59a3b5335f1d2e438b827384b79ac4f57ef18f6e", "parents": [ "27d9d3d22e980342fe7a2ab18777b59ad5e04a15" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu May 24 14:28:47 2012 -0700" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu May 24 14:28:47 2012 -0700" }, "message": "Modify Makefile for building for ASAN\n\nChange-Id: I18fe150f994d9217d0526660b1cac781fdac92cb\n" }, { "commit": "27d9d3d22e980342fe7a2ab18777b59ad5e04a15", "tree": "4f8ac1667a0e4ddf0bfc96a58ed55c0595796b2b", "parents": [ "4f8351323b84a7b8c3275e6df8a99a4738fabf45", "5ba1edeaf0a7895f2975d37c5002677d86a8f837", "5ba1edeaf0a7895f2975d37c5002677d86a8f837" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 16 08:40:28 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 16 08:40:29 2012 -0700" }, "message": "Reconcile with jb-release nakasi-factoryrom-release\n\nChange-Id: Ibe87f908fb7665825284926900227a6f6428e153\n" }, { "commit": "5ba1edeaf0a7895f2975d37c5002677d86a8f837", "tree": "4f8ac1667a0e4ddf0bfc96a58ed55c0595796b2b", "parents": [ "4f8351323b84a7b8c3275e6df8a99a4738fabf45", "d473d7ae9135c9ca149a361b78366a753e1c0d5f" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Apr 30 07:00:40 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Apr 30 07:00:40 2012 -0700" }, "message": "merge in jb-release history after reset to jb-dev\n" }, { "commit": "4f8351323b84a7b8c3275e6df8a99a4738fabf45", "tree": "4f8ac1667a0e4ddf0bfc96a58ed55c0595796b2b", "parents": [ "8e8529d08429cac48a02b12b41b292bdd697ec53" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Fri Apr 27 10:08:17 2012 -0700" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Fri Apr 27 10:15:59 2012 -0700" }, "message": "Properly clean an exception to prevent a crash\n\nBug: 6404408\nChange-Id: Id9a6e1ff303076da24f0221d3bc905ba0710f07e\n" }, { "commit": "8e8529d08429cac48a02b12b41b292bdd697ec53", "tree": "0b01485fcf78982c17a3b3ae915160c6f2fea9bb", "parents": [ "fb292835997c64a14669de65d74ba5357aa4d7d7", "ccec64d1f91dab09f7e3c6b9d6559e72aa4b46c7" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Tue Apr 03 10:41:15 2012 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Tue Apr 03 10:41:15 2012 -0700" }, "message": "Merge remote-tracking branch \u0027goog/ics-aah\u0027\n" }, { "commit": "d473d7ae9135c9ca149a361b78366a753e1c0d5f", "tree": "0b01485fcf78982c17a3b3ae915160c6f2fea9bb", "parents": [ "731158395b8ae1105c69cc42dae6244385f6b4ff" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Wed Mar 28 09:14:25 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Mar 28 16:42:31 2012 -0700" }, "message": "Disable TLSv1.2 and TLSv1.1.\n\nBug: 6234791\n\nTemporarily disabling TLSv1.1 and TLSv1.2 as some sites do not seem\nto like it (agl reports 2% of sites have issues).\n\nChange-Id: I182bc8296e2fa2681ca2c997b5524c0135b385bf\n" }, { "commit": "fb292835997c64a14669de65d74ba5357aa4d7d7", "tree": "0b01485fcf78982c17a3b3ae915160c6f2fea9bb", "parents": [ "731158395b8ae1105c69cc42dae6244385f6b4ff" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Wed Mar 28 09:14:25 2012 -0700" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Wed Mar 28 10:39:30 2012 -0700" }, "message": "Disable TLSv1.2 and TLSv1.1.\n\nBug: 6234791\n\nTemporarily disabling TLSv1.1 and TLSv1.2 as some sites do not seem\nto like it (agl reports 2% of sites have issues).\n\nChange-Id: I182bc8296e2fa2681ca2c997b5524c0135b385bf\n" }, { "commit": "731158395b8ae1105c69cc42dae6244385f6b4ff", "tree": "bc86ca043296cb2eec389c376a33c944b2514261", "parents": [ "b2197cae52338e04bb2b7911faae7bab57fcc7bc" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Mar 21 16:10:05 2012 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Mar 21 16:19:53 2012 -0700" }, "message": "Make SSL_CIPHER_get_id definition conditional on OpenSSL version\n\nChange-Id: I7a28fe9753e12fc3f597b0938de88130f50918ee\n" }, { "commit": "b2197cae52338e04bb2b7911faae7bab57fcc7bc", "tree": "f886ff057f9f70ac1a04902e8ef4f883f864aeb5", "parents": [ "a7dee89fba4aaa5f0be152cfc7c7b9b5cff98d51" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Fri Mar 16 14:44:14 2012 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Fri Mar 16 15:00:51 2012 -0700" }, "message": "Tracking openssl-1.0.1 upgrade\n\nBug: 6168278\n\nChange-Id: I5df5750bf7fa15fe98d17e072943613966127a77\n" }, { "commit": "a7dee89fba4aaa5f0be152cfc7c7b9b5cff98d51", "tree": "89f744b6727cb92b1ec1bffd13511d16a7e90209", "parents": [ "4f3a742b60841cf402cd4192bd864afb7306356b" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Wed Feb 22 17:41:36 2012 -0800" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Feb 23 10:30:53 2012 -0800" }, "message": "Import content and address detector support\n\nChange-Id: Iea123dd9b46b067105f945acd9e7ba8ba4421cf9\n" }, { "commit": "4f3a742b60841cf402cd4192bd864afb7306356b", "tree": "c3120824726c59321933365d001f5d6dd4b65d01", "parents": [ "940e47a8a93a8720ca55c0966689f4cdd4bf5b4e" ], "author": { "name": "Ben Murdoch", "email": "benm@google.com", "time": "Tue Feb 14 16:16:29 2012 +0000" }, "committer": { "name": "Ben Murdoch", "email": "benm@google.com", "time": "Thu Feb 16 13:41:38 2012 +0000" }, "message": "Append client parameter to AutoFill server requests.\n\nBug: 4515820\nChange-Id: I32fe0918c0d9f80f1930a481e47c3e7ce285c329\n" }, { "commit": "940e47a8a93a8720ca55c0966689f4cdd4bf5b4e", "tree": "b40b20185de12cf0f660cd8b37be209e5112f39c", "parents": [ "754777ec24185272ad267a324907d384e274b648" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 22 13:35:45 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 22 13:35:45 2011 +0000" }, "message": "Fix for bug 5152544, remove warning from chromium port\n\nThis is a cherry-pick of http://codereview.chromium.org/8354008/\nNo more warnings after this is merged.\n\nChange-Id: I788d28545e7961d0145a3f1273ce4302f8c432ad\n" }, { "commit": "754777ec24185272ad267a324907d384e274b648", "tree": "b547141528dfc805f0ecc94027224e24fc7a1558", "parents": [ "13d6d0652e85d0bee7b5ef9f70df775a85499f7f", "361bc379144f4e67bca8b263c7a673fa73aafefc" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 17 15:12:39 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 15:12:39 2011 -0800" }, "message": "am 361bc379: Merge \"Enable persistent http connections.\" into ics-mr1\n\n* commit \u0027361bc379144f4e67bca8b263c7a673fa73aafefc\u0027:\n Enable persistent http connections.\n" }, { "commit": "13d6d0652e85d0bee7b5ef9f70df775a85499f7f", "tree": "c1c5959b7f42bcf48ee5f61624e77173bd76420e", "parents": [ "0e57822f1edee551d5683759d585e5a101dd37f8", "39ad9f5657323d3852f6741c79b830019baba4a8" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 17 15:12:38 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 15:12:38 2011 -0800" }, "message": "am 39ad9f56: Merge \"Defer closing idle sockets.\" into ics-mr1\n\n* commit \u002739ad9f5657323d3852f6741c79b830019baba4a8\u0027:\n Defer closing idle sockets.\n" }, { "commit": "0e57822f1edee551d5683759d585e5a101dd37f8", "tree": "0ae74f3b411f454b01dd8313f34c32fd8b3a7edf", "parents": [ "76039fd733a42ed3708bc6903719021beb378215", "efe273f2861c2ea723aa1f9edd20a73356da2b6b" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Nov 17 11:55:40 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 11:55:40 2011 -0800" }, "message": "am efe273f2: Part of fix for bug 5523834, backporting cache fixes\n\n* commit \u0027efe273f2861c2ea723aa1f9edd20a73356da2b6b\u0027:\n Part of fix for bug 5523834, backporting cache fixes\n" }, { "commit": "76039fd733a42ed3708bc6903719021beb378215", "tree": "0ae74f3b411f454b01dd8313f34c32fd8b3a7edf", "parents": [ "c267d3b5b32d85c5eaad7a21afaf6c4fc65249e7", "1ab02c36bee95e85558f6815b2836e9ee6a26b19" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Nov 17 11:55:39 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 11:55:39 2011 -0800" }, "message": "am 1ab02c36: (-s ours) Part of fix for bug 5523834, backporting cache fixes\n\n* commit \u00271ab02c36bee95e85558f6815b2836e9ee6a26b19\u0027:\n Part of fix for bug 5523834, backporting cache fixes\n" }, { "commit": "c267d3b5b32d85c5eaad7a21afaf6c4fc65249e7", "tree": "0ae74f3b411f454b01dd8313f34c32fd8b3a7edf", "parents": [ "379b9b16e3f88b20a59057a2b514db831fb9e902", "93bed14e13dd5a6dd3d68bcf6d3c7c1f691f669b" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Nov 17 11:52:50 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 11:52:50 2011 -0800" }, "message": "am 93bed14e: Part of fix for bug 5523834, backporting cache fixes\n\n* commit \u002793bed14e13dd5a6dd3d68bcf6d3c7c1f691f669b\u0027:\n Part of fix for bug 5523834, backporting cache fixes\n" }, { "commit": "379b9b16e3f88b20a59057a2b514db831fb9e902", "tree": "0ae74f3b411f454b01dd8313f34c32fd8b3a7edf", "parents": [ "e565d97ac5ffb02c9f7c7d7e6e8b036a9333c4c2", "a972e26e14066ec50afdaf4582836fe5fc4c190a" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Nov 17 11:52:49 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 11:52:49 2011 -0800" }, "message": "am a972e26e: (-s ours) Part of fix for bug 5523834, backporting cache fixes\n\n* commit \u0027a972e26e14066ec50afdaf4582836fe5fc4c190a\u0027:\n Part of fix for bug 5523834, backporting cache fixes\n" }, { "commit": "ccec64d1f91dab09f7e3c6b9d6559e72aa4b46c7", "tree": "11cb218dd431ce1608d588ec03b809f680ce36cd", "parents": [ "fdfa15584bef3f6b04e2999b483d3a4c13102072", "361bc379144f4e67bca8b263c7a673fa73aafefc" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 17 11:32:47 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 11:32:47 2011 -0800" }, "message": "am 361bc379: Merge \"Enable persistent http connections.\" into ics-mr1\n\n* commit \u0027361bc379144f4e67bca8b263c7a673fa73aafefc\u0027:\n Enable persistent http connections.\n" }, { "commit": "fdfa15584bef3f6b04e2999b483d3a4c13102072", "tree": "fdeade2e4fc5d5223dd83121241dc9d248cf5d6f", "parents": [ "36c0c7306a6a010112f10a52510854404ea869d1", "39ad9f5657323d3852f6741c79b830019baba4a8" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 17 11:32:46 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 11:32:46 2011 -0800" }, "message": "am 39ad9f56: Merge \"Defer closing idle sockets.\" into ics-mr1\n\n* commit \u002739ad9f5657323d3852f6741c79b830019baba4a8\u0027:\n Defer closing idle sockets.\n" }, { "commit": "361bc379144f4e67bca8b263c7a673fa73aafefc", "tree": "11cb218dd431ce1608d588ec03b809f680ce36cd", "parents": [ "39ad9f5657323d3852f6741c79b830019baba4a8", "f5b478bbe82e8c35486a2e2ec5cabdd8b7f3fc0f" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 17 11:31:44 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 17 11:31:44 2011 -0800" }, "message": "Merge \"Enable persistent http connections.\" into ics-mr1" }, { "commit": "39ad9f5657323d3852f6741c79b830019baba4a8", "tree": "fdeade2e4fc5d5223dd83121241dc9d248cf5d6f", "parents": [ "efe273f2861c2ea723aa1f9edd20a73356da2b6b", "088da08b1e594e2e3cae7114394145e8268ab6c9" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 17 11:31:21 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 17 11:31:21 2011 -0800" }, "message": "Merge \"Defer closing idle sockets.\" into ics-mr1" }, { "commit": "f5b478bbe82e8c35486a2e2ec5cabdd8b7f3fc0f", "tree": "123725f3da00602a7350897d284b1236b37589f7", "parents": [ "2c4085b2006233b5e3a3fe507d62642377b5dc2e" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 17 11:09:09 2011 -0800" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 17 11:11:08 2011 -0800" }, "message": "Enable persistent http connections.\n\n\tBug:5347735\n\nChange-Id: I03712a4a9a59b62440b6190fc84fe8ed78d072e7\n" }, { "commit": "088da08b1e594e2e3cae7114394145e8268ab6c9", "tree": "c0348ccb3dc05001100f124e81fb0784434d93e9", "parents": [ "2c4085b2006233b5e3a3fe507d62642377b5dc2e" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Wed Nov 16 11:15:36 2011 -0800" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 17 11:04:07 2011 -0800" }, "message": "Defer closing idle sockets.\n\n\tBug: 5523884\nbackport changes from chrome to defer closing idle sockets until\nnext socket request (for power efficiency). This does not enable\npersistent connections.\n\nChange-Id: Iab82f546e8607ddc4cacc576cda52c4d2d536570\n" }, { "commit": "36c0c7306a6a010112f10a52510854404ea869d1", "tree": "99bcfc7809ae4cf70669085cadc4067521b5079b", "parents": [ "6c56142cac0a61d46d4a444ffe09cfbf1a66c876", "efe273f2861c2ea723aa1f9edd20a73356da2b6b" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Nov 17 03:22:22 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 03:22:22 2011 -0800" }, "message": "am efe273f2: Part of fix for bug 5523834, backporting cache fixes\n\n* commit \u0027efe273f2861c2ea723aa1f9edd20a73356da2b6b\u0027:\n Part of fix for bug 5523834, backporting cache fixes\n" }, { "commit": "6c56142cac0a61d46d4a444ffe09cfbf1a66c876", "tree": "d0cb945cc7a86deeb1c48449e0cbc6fc7bec1d6b", "parents": [ "3a14c9bbe51d89a2d6435c3cec12f59675bde0a8", "1ab02c36bee95e85558f6815b2836e9ee6a26b19" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Nov 17 03:22:21 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 03:22:21 2011 -0800" }, "message": "am 1ab02c36: Part of fix for bug 5523834, backporting cache fixes\n\n* commit \u00271ab02c36bee95e85558f6815b2836e9ee6a26b19\u0027:\n Part of fix for bug 5523834, backporting cache fixes\n" }, { "commit": "3a14c9bbe51d89a2d6435c3cec12f59675bde0a8", "tree": "7b38289e7ab762063311206a4297fcd1f35546fb", "parents": [ "2eabaec57ce0053fc96db1c4ac4251a769d3363e", "93bed14e13dd5a6dd3d68bcf6d3c7c1f691f669b" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Nov 17 03:22:20 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 03:22:20 2011 -0800" }, "message": "am 93bed14e: Part of fix for bug 5523834, backporting cache fixes\n\n* commit \u002793bed14e13dd5a6dd3d68bcf6d3c7c1f691f669b\u0027:\n Part of fix for bug 5523834, backporting cache fixes\n" }, { "commit": "2eabaec57ce0053fc96db1c4ac4251a769d3363e", "tree": "7109f8fe4b914739e14753f6cac6afca20cdc53a", "parents": [ "2ecbdadf716e490ba8aa6531761782cb7958999d", "a972e26e14066ec50afdaf4582836fe5fc4c190a" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Nov 17 03:22:19 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 03:22:19 2011 -0800" }, "message": "am a972e26e: Part of fix for bug 5523834, backporting cache fixes\n\n* commit \u0027a972e26e14066ec50afdaf4582836fe5fc4c190a\u0027:\n Part of fix for bug 5523834, backporting cache fixes\n" }, { "commit": "efe273f2861c2ea723aa1f9edd20a73356da2b6b", "tree": "99bcfc7809ae4cf70669085cadc4067521b5079b", "parents": [ "1ab02c36bee95e85558f6815b2836e9ee6a26b19" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 18:10:25 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 15 21:51:45 2011 +0000" }, "message": "Part of fix for bug 5523834, backporting cache fixes\n\nThis is hopefully a fix for bug 5255299\n\nCherry-picking CL\nhttp://src.chromium.org/viewvc/chrome?view\u003drev\u0026revision\u003d103323\n\nDid not cherry-pick the changes in\ntrunk/src/net/disk_cache/backend_unittest.cc\nas we are not running the tests on Android.\n\nChange-Id: I765b72d7c9e93e2a87aa5ad84ad62ca6ab38eac0\n" }, { "commit": "1ab02c36bee95e85558f6815b2836e9ee6a26b19", "tree": "d0cb945cc7a86deeb1c48449e0cbc6fc7bec1d6b", "parents": [ "93bed14e13dd5a6dd3d68bcf6d3c7c1f691f669b" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 14:56:51 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 15 21:51:33 2011 +0000" }, "message": "Part of fix for bug 5523834, backporting cache fixes\n\nThis is hopefully a fix for bug 5255299\n\nCherry-picking CL\nhttp://src.chromium.org/viewvc/chrome?view\u003drev\u0026revision\u003d93059\n\nChange-Id: I2295cb29dc4ac1f97ceb492ea77a205a2b5c7a05\n" }, { "commit": "93bed14e13dd5a6dd3d68bcf6d3c7c1f691f669b", "tree": "7b38289e7ab762063311206a4297fcd1f35546fb", "parents": [ "a972e26e14066ec50afdaf4582836fe5fc4c190a" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 14:30:59 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 15 21:51:19 2011 +0000" }, "message": "Part of fix for bug 5523834, backporting cache fixes\n\nThis is hopefully a fix for bug 5255299\n\nCherry-picking CL\nhttp://src.chromium.org/viewvc/chrome?view\u003drev\u0026revision\u003d92390\n\nChange-Id: I2f9905bf2f53dd958eb17d1af789fcfb35224061\n" }, { "commit": "a972e26e14066ec50afdaf4582836fe5fc4c190a", "tree": "7109f8fe4b914739e14753f6cac6afca20cdc53a", "parents": [ "2c4085b2006233b5e3a3fe507d62642377b5dc2e" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 11:46:33 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 15 21:50:40 2011 +0000" }, "message": "Part of fix for bug 5523834, backporting cache fixes\n\nThis is hopefully a fix for bug 5255299\n\nCherry-picking CL\nhttp://src.chromium.org/viewvc/chrome?view\u003drev\u0026revision\u003d84877\n\nChange-Id: Ie38ecab599eb0d1bdb8a77efd7dd7f416ef26701\n" }, { "commit": "e565d97ac5ffb02c9f7c7d7e6e8b036a9333c4c2", "tree": "0ae74f3b411f454b01dd8313f34c32fd8b3a7edf", "parents": [ "6aec04f56872b7b764c365c1ad4e3bba2d708977", "2c4085b2006233b5e3a3fe507d62642377b5dc2e" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Fri Nov 11 13:59:12 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 13:59:12 2011 -0800" }, "message": "am 2c4085b2: Backport SPDY ping changes from chrome 16.\n\n* commit \u00272c4085b2006233b5e3a3fe507d62642377b5dc2e\u0027:\n Backport SPDY ping changes from chrome 16.\n" }, { "commit": "2ecbdadf716e490ba8aa6531761782cb7958999d", "tree": "a2b9da4aec8d05b0c6566d4b4edae4764184fdad", "parents": [ "4e280c94701db5d20c0f749fc25046771fd7dee0", "2c4085b2006233b5e3a3fe507d62642377b5dc2e" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Fri Nov 11 13:40:07 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 13:40:07 2011 -0800" }, "message": "am 2c4085b2: Backport SPDY ping changes from chrome 16.\n\n* commit \u00272c4085b2006233b5e3a3fe507d62642377b5dc2e\u0027:\n Backport SPDY ping changes from chrome 16.\n" }, { "commit": "2c4085b2006233b5e3a3fe507d62642377b5dc2e", "tree": "a2b9da4aec8d05b0c6566d4b4edae4764184fdad", "parents": [ "b54fbb0d9cf6451f1683823838b6c0d2b345ed4b" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 10 18:38:04 2011 -0800" }, "committer": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Nov 10 18:51:24 2011 -0800" }, "message": "Backport SPDY ping changes from chrome 16.\n\n\tBug: 5524112\n\nBackported Chrome 16 changes for SPDY Ping. The Chrome changes\nare:\nhttp://codereview.chromium.org/8036016\nhttp://codereview.chromium.org/8230037\nhttp://codereview.chromium.org/8319015\nhttp://codereview.chromium.org/8330002\n\nAlso enable the SPDY protocol.\n\nChange-Id: I2c25c19135ec1c75361d51fdbfbbbbb19f0a3098\nSigned-off-by: Selim Gurun \u003csgurun@google.com\u003e\n" }, { "commit": "6aec04f56872b7b764c365c1ad4e3bba2d708977", "tree": "8f1efac93e5d369ede996eea4833cc778380b631", "parents": [ "ae2796cabb52f6a27c50818b78107d3ebc858e0c" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Wed Nov 09 11:33:26 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Wed Nov 09 11:33:26 2011 +0000" }, "message": "Part of fix for bug 5584571 Add HTTP request header with app name\n\nCherry-picking net/url_request/url_request.cc part of:\nhttp://codereview.chromium.org/7647028\n\nNeeded to add more headers to request by name.\n\nChange-Id: I102d7aa4f8cf4c9e77a55fb4f3bf2294390089c5\n" }, { "commit": "ae2796cabb52f6a27c50818b78107d3ebc858e0c", "tree": "0cadef3e3ea102f04b2e26c212b089dfd69a0fc2", "parents": [ "ea380985f4dd3c72953f7df161674e1644d6de90" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 18:10:25 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Wed Nov 02 11:47:20 2011 +0000" }, "message": "Part of fix for bug 5523834, backporting cache fixes\n\nCherry-picking CL\nhttp://src.chromium.org/viewvc/chrome?view\u003drev\u0026revision\u003d103323\n\nDid not cherry-pick the changes in\ntrunk/src/net/disk_cache/backend_unittest.cc\nas we are not running the tests on Android.\n\nChange-Id: I4e04bf061bdb6746030f3a93501cff9b384c58df\n" }, { "commit": "ea380985f4dd3c72953f7df161674e1644d6de90", "tree": "d1d12d67e4852487c1ccc3fa110c7712bf831c83", "parents": [ "d129b9e5870dc7fa49745121bf987e1b6ead1b51" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 14:56:51 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 14:56:51 2011 +0000" }, "message": "Part of fix for bug 5523834, backporting cache fixes\n\nCherry-picking CL\nhttp://src.chromium.org/viewvc/chrome?view\u003drev\u0026revision\u003d93059\n\nChange-Id: I2e68fa722b65bd107846b6c8e84112844386bd94\n" }, { "commit": "d129b9e5870dc7fa49745121bf987e1b6ead1b51", "tree": "e9db611a4aca513f68018d1fc213ba54bd39e66b", "parents": [ "0a9239c3bca6d8a7147c80243b17a02340fe6d31" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 14:30:59 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 14:30:59 2011 +0000" }, "message": "Part of fix for bug 5523834, backporting cache fixes\n\nCherry-picking CL\nhttp://src.chromium.org/viewvc/chrome?view\u003drev\u0026revision\u003d92390\n\nChange-Id: I77f8cbd61c90e90ca437fd73bf10afa29e606d7f\n" }, { "commit": "0a9239c3bca6d8a7147c80243b17a02340fe6d31", "tree": "841cfa833f5ab94e676b97893ab5eddee6b3dd58", "parents": [ "92b6b8e6dd0ba578b9091f7826568fccab6d2cf9" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 11:46:33 2011 +0000" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Nov 01 11:46:33 2011 +0000" }, "message": "Part of fix for bug 5523834, backporting cache fixes\n\nCherry-picking CL\nhttp://src.chromium.org/viewvc/chrome?view\u003drev\u0026revision\u003d84877\n\nChange-Id: Iaaa408fbf4375570e5d8bbb59314f8bedc7393a1\n" }, { "commit": "4e280c94701db5d20c0f749fc25046771fd7dee0", "tree": "ac563b064274c49ff9a5c16fef9f8e778036e0d1", "parents": [ "b54fbb0d9cf6451f1683823838b6c0d2b345ed4b", "8b0d37a565702fcb07ed7a576432546ac5eaffea" ], "author": { "name": "Ed Heyl", "email": "ed@google.com", "time": "Fri Oct 28 19:05:46 2011 +0000" }, "committer": { "name": "Ed Heyl", "email": "ed@google.com", "time": "Fri Oct 28 19:05:46 2011 +0000" }, "message": "keep previous history after reset to mr1 plus aah changes (ics-aah-wip)\n" }, { "commit": "8b0d37a565702fcb07ed7a576432546ac5eaffea", "tree": "b04233f2e91a2dad7bfe301441f98e37c3f4e544", "parents": [ "3e233ada0c8478e05c8a262eb2d4a7939e3d0aeb", "e230e0ed1201b6d38840e27d0405b48f6106caf4" ], "author": { "name": "Ed Heyl", "email": "ed@google.com", "time": "Wed Oct 26 21:53:17 2011 +0000" }, "committer": { "name": "Ed Heyl", "email": "ed@google.com", "time": "Wed Oct 26 21:53:17 2011 +0000" }, "message": "undo reset to ics-mr1 until we have a better method\n" }, { "commit": "e230e0ed1201b6d38840e27d0405b48f6106caf4", "tree": "ac563b064274c49ff9a5c16fef9f8e778036e0d1", "parents": [ "b54fbb0d9cf6451f1683823838b6c0d2b345ed4b", "3e233ada0c8478e05c8a262eb2d4a7939e3d0aeb" ], "author": { "name": "Ed Heyl", "email": "ed@google.com", "time": "Wed Oct 26 18:50:13 2011 +0000" }, "committer": { "name": "Ed Heyl", "email": "ed@google.com", "time": "Wed Oct 26 18:50:13 2011 +0000" }, "message": "reset to ics-mr1, but keep history\n" }, { "commit": "3e233ada0c8478e05c8a262eb2d4a7939e3d0aeb", "tree": "b04233f2e91a2dad7bfe301441f98e37c3f4e544", "parents": [ "f97d22b88d9f81aed4cb5cfb3776b8df162ed2ae", "92b6b8e6dd0ba578b9091f7826568fccab6d2cf9" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Oct 25 10:29:56 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 25 10:29:56 2011 -0700" }, "message": "am 92b6b8e6: Merge \"fix for bug 5454586, fix up getDbThread()\"\n\n* commit \u002792b6b8e6dd0ba578b9091f7826568fccab6d2cf9\u0027:\n fix for bug 5454586, fix up getDbThread()\n" }, { "commit": "92b6b8e6dd0ba578b9091f7826568fccab6d2cf9", "tree": "b04233f2e91a2dad7bfe301441f98e37c3f4e544", "parents": [ "b54fbb0d9cf6451f1683823838b6c0d2b345ed4b", "7d2c383403f05ced9ca2ac2389b4c3747688d335" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Oct 25 08:56:23 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 25 08:56:23 2011 -0700" }, "message": "Merge \"fix for bug 5454586, fix up getDbThread()\"" }, { "commit": "7d2c383403f05ced9ca2ac2389b4c3747688d335", "tree": "35b37451e352cb766bc3dd33865a29034a72d058", "parents": [ "9fb7297dd54aca7ba646ee27608529f33634a7b2" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Fri Oct 21 17:48:24 2011 +0100" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 12:17:24 2011 +0100" }, "message": "fix for bug 5454586, fix up getDbThread()\n\nCreating a LazyInstance and removing getter function, just\nusing the object that should now be thread safe.\n\nMinor indenting change.\n\nChange-Id: I9deca3f10d96fdaf655a28b8f4d8db8efdc1803a\n" }, { "commit": "f97d22b88d9f81aed4cb5cfb3776b8df162ed2ae", "tree": "ac563b064274c49ff9a5c16fef9f8e778036e0d1", "parents": [ "c3316eaa89943a2f6a8c51c831807b5e42d6d99b", "b54fbb0d9cf6451f1683823838b6c0d2b345ed4b" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 04:09:28 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 24 04:09:28 2011 -0700" }, "message": "am b54fbb0d: Fix for build break\n\n* commit \u0027b54fbb0d9cf6451f1683823838b6c0d2b345ed4b\u0027:\n Fix for build break\n" }, { "commit": "b54fbb0d9cf6451f1683823838b6c0d2b345ed4b", "tree": "ac563b064274c49ff9a5c16fef9f8e778036e0d1", "parents": [ "9fb7297dd54aca7ba646ee27608529f33634a7b2" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 11:54:50 2011 +0100" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 12:03:26 2011 +0100" }, "message": "Fix for build break\n\nExport needed function for SPDY support\n\nChange-Id: I2a6c819d79dbc9dcf2e12eb41072cc0245954200\n" }, { "commit": "c3316eaa89943a2f6a8c51c831807b5e42d6d99b", "tree": "95467c8be8545d07a24495c2c8a1b644795c7e75", "parents": [ "e1ab1f63a849e42fb3d11ca671030b83897b96d3", "9fb7297dd54aca7ba646ee27608529f33634a7b2" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 03:05:09 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 24 03:05:09 2011 -0700" }, "message": "am 9fb7297d: Part of fix for bug 5455901 Fix makefile, turn off exporting everything\n\n* commit \u00279fb7297dd54aca7ba646ee27608529f33634a7b2\u0027:\n Part of fix for bug 5455901 Fix makefile, turn off exporting everything\n" }, { "commit": "e1ab1f63a849e42fb3d11ca671030b83897b96d3", "tree": "4d145a956dc4777636ce03595c2cfa1019abc99e", "parents": [ "3deac21344eb9e156d9bcbb2ea11f097ecd6b89a", "4154342345fc67972570f59528233826cd397f1e" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 03:05:08 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 24 03:05:08 2011 -0700" }, "message": "am 41543423: Part of fix for bug 5455901 Export symbols from base\n\n* commit \u00274154342345fc67972570f59528233826cd397f1e\u0027:\n Part of fix for bug 5455901 Export symbols from base\n" }, { "commit": "3deac21344eb9e156d9bcbb2ea11f097ecd6b89a", "tree": "2f0d1e46a96a9567977438bade73b2688159335b", "parents": [ "29cf8ac88ef8291f055f7323fa0a26869237ca8e", "a1fe9c0450e6d56112949b33ef2f7491e0cf0f60" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 03:05:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 24 03:05:07 2011 -0700" }, "message": "am a1fe9c04: Part of fix for bug 5455901 Add exports needed for autofill and cookies\n\n* commit \u0027a1fe9c0450e6d56112949b33ef2f7491e0cf0f60\u0027:\n Part of fix for bug 5455901 Add exports needed for autofill and cookies\n" }, { "commit": "29cf8ac88ef8291f055f7323fa0a26869237ca8e", "tree": "fd8616ea611ced9bc56b91ae8257678d9d228c58", "parents": [ "7c64b48173bdf97d0ce1da5be37dc682185c5671", "2557749644f9d25af9721533322db19197c49b49" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 03:05:06 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 24 03:05:06 2011 -0700" }, "message": "am 25577496: Part of fix for bug 5455901 Export symbols from net/\n\n* commit \u00272557749644f9d25af9721533322db19197c49b49\u0027:\n Part of fix for bug 5455901 Export symbols from net/\n" }, { "commit": "7c64b48173bdf97d0ce1da5be37dc682185c5671", "tree": "7536e811f0518ca0e29ae7482e8fe0c12860b65d", "parents": [ "008a72709c6a2c8e00996025f72e49776b27f414", "a3fef89eb00853adb6524ab3d11c60f754f08b09" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 03:05:06 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 24 03:05:06 2011 -0700" }, "message": "am a3fef89e: Part of fix for bug 5455901 Export symbols in android/\n\n* commit \u0027a3fef89eb00853adb6524ab3d11c60f754f08b09\u0027:\n Part of fix for bug 5455901 Export symbols in android/\n" }, { "commit": "008a72709c6a2c8e00996025f72e49776b27f414", "tree": "97a0521fea476931561883408b88d96cd8b57fd7", "parents": [ "a9e4cb016c4bc9a182b5da4f5662c36e14b689f4", "cd7ce18ede8128e5c7a10cbc96c9ab197a4999b0" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Mon Oct 24 03:05:05 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 24 03:05:05 2011 -0700" }, "message": "am cd7ce18e: Part of fix for bug 5455901 adding net_export.h\n\n* commit \u0027cd7ce18ede8128e5c7a10cbc96c9ab197a4999b0\u0027:\n Part of fix for bug 5455901 adding net_export.h\n" }, { "commit": "9fb7297dd54aca7ba646ee27608529f33634a7b2", "tree": "95467c8be8545d07a24495c2c8a1b644795c7e75", "parents": [ "4154342345fc67972570f59528233826cd397f1e" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Oct 18 14:20:15 2011 +0100" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Fri Oct 21 12:40:15 2011 +0100" }, "message": "Part of fix for bug 5455901 Fix makefile, turn off exporting everything\n\nFinal fix, turn off exporting everything in the makefile, and\nadd needed defines\n\nChange-Id: Id0ed1eefa375462a9023ff22ea692631d8477a93\n" }, { "commit": "4154342345fc67972570f59528233826cd397f1e", "tree": "4d145a956dc4777636ce03595c2cfa1019abc99e", "parents": [ "a1fe9c0450e6d56112949b33ef2f7491e0cf0f60" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Oct 18 14:19:13 2011 +0100" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Fri Oct 21 12:40:06 2011 +0100" }, "message": "Part of fix for bug 5455901 Export symbols from base\n\nSome are upstream, others guarded with #ifdef ANDROID are not\n\nChange-Id: I8615feafc0ad088d237794acdace655d9f842c12\n" }, { "commit": "a1fe9c0450e6d56112949b33ef2f7491e0cf0f60", "tree": "2f0d1e46a96a9567977438bade73b2688159335b", "parents": [ "2557749644f9d25af9721533322db19197c49b49" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Tue Oct 18 13:53:58 2011 +0100" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Fri Oct 21 12:31:00 2011 +0100" }, "message": "Part of fix for bug 5455901 Add exports needed for autofill and cookies\n\nLocal only exports due to using of autofill and cookies outside chromium.\nAll changes marked with #ifdef ANDROID\n\nChange-Id: I72dcd7fe0fe546073c271663123ba17469deaa83\n" }, { "commit": "2557749644f9d25af9721533322db19197c49b49", "tree": "fd8616ea611ced9bc56b91ae8257678d9d228c58", "parents": [ "a3fef89eb00853adb6524ab3d11c60f754f08b09" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Fri Oct 14 14:40:18 2011 +0100" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Fri Oct 21 12:31:00 2011 +0100" }, "message": "Part of fix for bug 5455901 Export symbols from net/\n\nExporting needed symbols for linking libwebcore and libstagefright.\n\nEverything here is cherrypicks from upstream, but only taking\nthe definitions we need to satisfy linker errors.\n\nOne exception is in openssl_private_key_store.h, which because of this\nuses an android guard.\n\nChange-Id: I74a8f2bfd63a83c2c1684ba955fcdf00bcb2666a\n" }, { "commit": "a3fef89eb00853adb6524ab3d11c60f754f08b09", "tree": "7536e811f0518ca0e29ae7482e8fe0c12860b65d", "parents": [ "cd7ce18ede8128e5c7a10cbc96c9ab197a4999b0" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Oct 13 18:35:40 2011 +0100" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Fri Oct 21 12:31:00 2011 +0100" }, "message": "Part of fix for bug 5455901 Export symbols in android/\n\nExporting needed symbols from Android specific code.\n\nUsed NET_EXPORT for net code and BASE_API for other code.\n\nChange-Id: Ief7426180eec993bbe894e7231b224dcac657c7b\n" }, { "commit": "cd7ce18ede8128e5c7a10cbc96c9ab197a4999b0", "tree": "97a0521fea476931561883408b88d96cd8b57fd7", "parents": [ "eaa86de4aa5278c05c8f4798a564a26ad2b1b0bc" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Oct 13 17:52:51 2011 +0100" }, "committer": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Fri Oct 21 12:31:00 2011 +0100" }, "message": "Part of fix for bug 5455901 adding net_export.h\n\nAdding net/base/net_export as it is in ToT chromium.\n\nChange-Id: Ia6e36b981854b26cf4ccdb315941dfb05aea0ff4\n" }, { "commit": "a9e4cb016c4bc9a182b5da4f5662c36e14b689f4", "tree": "914c88c1e5c17dce631969dd4d427f0188bd7801", "parents": [ "9914abdf90c42a1729fcf3113a1150a928945f37", "eaa86de4aa5278c05c8f4798a564a26ad2b1b0bc" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Wed Oct 19 09:42:43 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 19 09:42:43 2011 -0700" }, "message": "am eaa86de4: Remove temporary debug logging\n\n* commit \u0027eaa86de4aa5278c05c8f4798a564a26ad2b1b0bc\u0027:\n Remove temporary debug logging\n" }, { "commit": "eaa86de4aa5278c05c8f4798a564a26ad2b1b0bc", "tree": "914c88c1e5c17dce631969dd4d427f0188bd7801", "parents": [ "8d1e40fa83064d70b192f1b5aed95b8fc24e4cac" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Thu Oct 13 11:22:45 2011 +0100" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Wed Oct 19 16:03:08 2011 +0100" }, "message": "Remove temporary debug logging\n\nThis is a cherry-pick of https://android-git.corp.google.com/g/#/c/141900,\nwhich went into ics-mr0 only.\n\nBug: 5454995\nChange-Id: I970b59f6da4890d0b89566ffa1909c33707f9506\n" }, { "commit": "9914abdf90c42a1729fcf3113a1150a928945f37", "tree": "cba16b98cea0298f720d5730bc0c465765f85d91", "parents": [ "68b7deaf18571a90d1abfe7e1247e16cfa72df48", "8d1e40fa83064d70b192f1b5aed95b8fc24e4cac" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Fri Oct 14 09:26:56 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 14 09:26:56 2011 -0700" }, "message": "am 8d1e40fa: am c0c5e0fc: Fix SQLitePersistentCookieStore\\\u0027s getDbThread() to be threadsafe\n\n* commit \u00278d1e40fa83064d70b192f1b5aed95b8fc24e4cac\u0027:\n Fix SQLitePersistentCookieStore\u0027s getDbThread() to be threadsafe\n" }, { "commit": "8d1e40fa83064d70b192f1b5aed95b8fc24e4cac", "tree": "cba16b98cea0298f720d5730bc0c465765f85d91", "parents": [ "7d980efe6a2f9473c310a16bed689819ff3dee62", "c0c5e0fca18f5a0912fdba1bd5c5ca2ad0c2693c" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Fri Oct 14 09:25:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 14 09:25:07 2011 -0700" }, "message": "am c0c5e0fc: Fix SQLitePersistentCookieStore\\\u0027s getDbThread() to be threadsafe\n\n* commit \u0027c0c5e0fca18f5a0912fdba1bd5c5ca2ad0c2693c\u0027:\n Fix SQLitePersistentCookieStore\u0027s getDbThread() to be threadsafe\n" }, { "commit": "c0c5e0fca18f5a0912fdba1bd5c5ca2ad0c2693c", "tree": "914c88c1e5c17dce631969dd4d427f0188bd7801", "parents": [ "df5ec85c1f7d3b444e458a4652302aca23624cc1" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Thu Oct 13 11:41:07 2011 +0100" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Fri Oct 14 16:46:23 2011 +0100" }, "message": "Fix SQLitePersistentCookieStore\u0027s getDbThread() to be threadsafe\n\nThis is an updated version of https://android-git.corp.google.com/g/#/c/141899,\nwhich was rolled out, with the lock now static and moved to file scope to match\nChromium style.\n\nBug: 5244039\nChange-Id: Ic6a6e949b2adc8cf433e6468c1f84ed449af09bc\n" }, { "commit": "68b7deaf18571a90d1abfe7e1247e16cfa72df48", "tree": "2f8d4f486aad09345a6d4d18ee5d773b7117d559", "parents": [ "aafdbd7eeab4f9a3cdc91b2bc43008836c02126c", "7d980efe6a2f9473c310a16bed689819ff3dee62" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu Oct 13 14:12:12 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 13 14:12:12 2011 -0700" }, "message": "am 7d980efe: am df5ec85c: Merge \"Causing webviews to hang.\" into ics-mr0\n\n* commit \u00277d980efe6a2f9473c310a16bed689819ff3dee62\u0027:\n Causing webviews to hang.\n" }, { "commit": "7d980efe6a2f9473c310a16bed689819ff3dee62", "tree": "2f8d4f486aad09345a6d4d18ee5d773b7117d559", "parents": [ "e3b44106f63aebd3a6e753bdebe4962455d5fcb9", "df5ec85c1f7d3b444e458a4652302aca23624cc1" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu Oct 13 14:07:18 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 13 14:07:18 2011 -0700" }, "message": "am df5ec85c: Merge \"Causing webviews to hang.\" into ics-mr0\n\n* commit \u0027df5ec85c1f7d3b444e458a4652302aca23624cc1\u0027:\n Causing webviews to hang.\n" }, { "commit": "df5ec85c1f7d3b444e458a4652302aca23624cc1", "tree": "437786ad40b9f1974b704022e81c249f5fa517ac", "parents": [ "08712c353f0e36ed1c0fd55ff369ca899d1bc9c5", "36871a877257fe861e4a31c5f4b81693ee2dd027" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu Oct 13 14:05:18 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 13 14:05:18 2011 -0700" }, "message": "Merge \"Causing webviews to hang.\" into ics-mr0" } ], "next": "36871a877257fe861e4a31c5f4b81693ee2dd027" }