)]}' { "log": [ { "commit": "bd3f24e7f1043fd04204b94f32136829d0c96514", "tree": "9e5a0fe599b704f0c80f81ef6cf287c6928f7c64", "parents": [ "82a3307a06dcaba40104b6d41f1e197365c53009", "bc9c82fb7960b99d6c21839b337360fbf6f8d9a5" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Oct 21 16:22:58 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 16:22:58 2010 -0700" }, "message": "am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES\n\nMerge commit \u00271d79a9d9f85f932a1fd6dcddba335450b65ba4e6\u0027 into gingerbread-plus-aosp\n\n* commit \u00271d79a9d9f85f932a1fd6dcddba335450b65ba4e6\u0027:\n Use correct size of GAMEPAD_KEYCODES\n" }, { "commit": "bc9c82fb7960b99d6c21839b337360fbf6f8d9a5", "tree": "8132cda721524b032d89f413bc970ec92997afff", "parents": [ "e739a5257d7c02b987d9b16046407797f83d1a7d" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Oct 21 15:46:03 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Oct 21 15:46:03 2010 -0700" }, "message": "Use correct size of GAMEPAD_KEYCODES\n\nCompute the actual number of indices in the GAMEPAD_KEYCODES instead of\nthe pure size in bytes.\n\nBug: 3121536\nChange-Id: I71edbd8bf6eff2c8cc0ea5c6845362b3d1e06466\n" }, { "commit": "82a3307a06dcaba40104b6d41f1e197365c53009", "tree": "5af3dfc34b36fbee01ad90cb3e58bf582b565c1c", "parents": [ "aa514a15708711ef3e2ec2acb59e4ca77860f1e8", "e739a5257d7c02b987d9b16046407797f83d1a7d" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Oct 21 12:57:03 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 12:57:03 2010 -0700" }, "message": "am 703aae06: Merge \"RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.\" into gingerbread\n\nMerge commit \u0027703aae06c0925b19657877bb1872bb2f28874969\u0027 into gingerbread-plus-aosp\n\n* commit \u0027703aae06c0925b19657877bb1872bb2f28874969\u0027:\n RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.\n" }, { "commit": "e739a5257d7c02b987d9b16046407797f83d1a7d", "tree": "ae3488c1ca8e659a38615136acf91735e55722bc", "parents": [ "6427fde659578debdcd77068351c64388fdc1182", "89b8c939c424258f489201c5561d778698636e01" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Oct 21 12:53:37 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 21 12:53:37 2010 -0700" }, "message": "Merge \"RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.\" into gingerbread" }, { "commit": "aa514a15708711ef3e2ec2acb59e4ca77860f1e8", "tree": "5af3dfc34b36fbee01ad90cb3e58bf582b565c1c", "parents": [ "4a60d1cddfb80ed5b6e60f9e27c5308e33e01657", "6427fde659578debdcd77068351c64388fdc1182" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu Oct 21 11:50:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 11:50:55 2010 -0700" }, "message": "am 62d0970c: Merge \"allow dumpstate to work for non-root users.\" into gingerbread\n\nMerge commit \u002762d0970c82f9a2c17aea67379c207a3f17556c46\u0027 into gingerbread-plus-aosp\n\n* commit \u002762d0970c82f9a2c17aea67379c207a3f17556c46\u0027:\n allow dumpstate to work for non-root users.\n" }, { "commit": "4a60d1cddfb80ed5b6e60f9e27c5308e33e01657", "tree": "5af3dfc34b36fbee01ad90cb3e58bf582b565c1c", "parents": [ "c24ad3f9e50025a3ed22099a1a6db25d1d8e5751", "84adbf3770ec190bfc9e5ad1a3e2be87bf48125d" ], "author": { "name": "John Huang", "email": "jsh@google.com", "time": "Thu Oct 21 11:46:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 11:46:55 2010 -0700" }, "message": "am 7dc08fb0: Merge \"Fix connect duration for un-established SIP calls.\" into gingerbread\n\nMerge commit \u00277dc08fb070ff7455e794fc81645ccb4349cd152f\u0027 into gingerbread-plus-aosp\n\n* commit \u00277dc08fb070ff7455e794fc81645ccb4349cd152f\u0027:\n Fix connect duration for un-established SIP calls.\n" }, { "commit": "6427fde659578debdcd77068351c64388fdc1182", "tree": "ae3488c1ca8e659a38615136acf91735e55722bc", "parents": [ "84adbf3770ec190bfc9e5ad1a3e2be87bf48125d", "2a9c6d09136a3d89b14cbfaaf9dcb58edc84cf7b" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu Oct 21 11:35:49 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 21 11:35:49 2010 -0700" }, "message": "Merge \"allow dumpstate to work for non-root users.\" into gingerbread" }, { "commit": "84adbf3770ec190bfc9e5ad1a3e2be87bf48125d", "tree": "ae3488c1ca8e659a38615136acf91735e55722bc", "parents": [ "81b5fbfdacbd36b1379638a4bacd55a6ffee3647" ], "author": { "name": "John Huang", "email": "jsh@google.com", "time": "Thu Oct 21 10:46:17 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 21 10:46:17 2010 -0700" }, "message": "Merge \"Fix connect duration for un-established SIP calls.\" into gingerbread" }, { "commit": "c24ad3f9e50025a3ed22099a1a6db25d1d8e5751", "tree": "5af3dfc34b36fbee01ad90cb3e58bf582b565c1c", "parents": [ "888ddb301cf82d7c533ccd263908ee962927ab5c", "81b5fbfdacbd36b1379638a4bacd55a6ffee3647" ], "author": { "name": "Sylvain Fonteneau", "email": "sylvain.fonteneau@trusted-logic.com", "time": "Thu Oct 21 09:38:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 09:38:49 2010 -0700" }, "message": "am a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method.\n\nMerge commit \u0027a71354d76689802152c33af257092d639c03c421\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a71354d76689802152c33af257092d639c03c421\u0027:\n Enable presence check at application level using\n" }, { "commit": "888ddb301cf82d7c533ccd263908ee962927ab5c", "tree": "5af3dfc34b36fbee01ad90cb3e58bf582b565c1c", "parents": [ "318e1fe73b5fa24d495f0edc5ade0f21fc7e0e52", "81b5fbfdacbd36b1379638a4bacd55a6ffee3647" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Oct 21 09:38:15 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 09:38:15 2010 -0700" }, "message": "am 7ea5c45e: NFC settings cleanup.\n\nMerge commit \u00277ea5c45e8d89f59065f088d4e11cceeeed9d64d1\u0027 into gingerbread-plus-aosp\n\n* commit \u00277ea5c45e8d89f59065f088d4e11cceeeed9d64d1\u0027:\n NFC settings cleanup.\n" }, { "commit": "318e1fe73b5fa24d495f0edc5ade0f21fc7e0e52", "tree": "5af3dfc34b36fbee01ad90cb3e58bf582b565c1c", "parents": [ "f0ae78949d7d8a6758520c616284ab1d061e2221", "3789789c8fdf9005f5b7b9c6270db938a036f45b" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Thu Oct 21 09:10:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 09:10:55 2010 -0700" }, "message": "am 15358e14: Merge \"Make the base direction of the Arabic error pages RTL\"\n\nMerge commit \u002715358e145622df90942a444a63ae0006713b636d\u0027 into gingerbread-plus-aosp\n\n* commit \u002715358e145622df90942a444a63ae0006713b636d\u0027:\n Make the base direction of the Arabic error pages RTL\n" }, { "commit": "f0ae78949d7d8a6758520c616284ab1d061e2221", "tree": "5af3dfc34b36fbee01ad90cb3e58bf582b565c1c", "parents": [ "17308c25c4d77e356a09196d1a2c0c181350d664", "d504db89b91544fb6d76af790459bf775e3e4a82" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Thu Oct 21 09:10:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 09:10:47 2010 -0700" }, "message": "am 6cf9c394: Merge \"Set the base direction of the Hebrew error pages to RTL\"\n\nMerge commit \u00276cf9c39452c87fe424a0ca125cf797e1c5e0830b\u0027 into gingerbread-plus-aosp\n\n* commit \u00276cf9c39452c87fe424a0ca125cf797e1c5e0830b\u0027:\n Set the base direction of the Hebrew error pages to RTL\n" }, { "commit": "3789789c8fdf9005f5b7b9c6270db938a036f45b", "tree": "a298995a015476dc711bb2aa6287775665e02d2c", "parents": [ "d504db89b91544fb6d76af790459bf775e3e4a82", "2387e907c4e40cfb712d49d9bd75cbf05932825f" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Thu Oct 21 07:18:18 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu Oct 21 07:18:18 2010 -0700" }, "message": "Merge \"Make the base direction of the Arabic error pages RTL\"" }, { "commit": "d504db89b91544fb6d76af790459bf775e3e4a82", "tree": "a298995a015476dc711bb2aa6287775665e02d2c", "parents": [ "745d655cad4549254b6d63f0972ec0e1d5a533ef", "2387e907c4e40cfb712d49d9bd75cbf05932825f" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Thu Oct 21 07:18:02 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu Oct 21 07:18:02 2010 -0700" }, "message": "Merge \"Set the base direction of the Hebrew error pages to RTL\"" }, { "commit": "17308c25c4d77e356a09196d1a2c0c181350d664", "tree": "5af3dfc34b36fbee01ad90cb3e58bf582b565c1c", "parents": [ "483d8242712497d8866ab554610bbce43756736f", "81b5fbfdacbd36b1379638a4bacd55a6ffee3647" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 20 21:28:38 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 21:28:38 2010 -0700" }, "message": "am fa7a87fb: Merge \"File writer size estimation improvement\" into gingerbread\n\nMerge commit \u0027fa7a87fb4b3d25b0b6b0985d65848a144d28df26\u0027 into gingerbread-plus-aosp\n\n* commit \u0027fa7a87fb4b3d25b0b6b0985d65848a144d28df26\u0027:\n File writer size estimation improvement\n" }, { "commit": "483d8242712497d8866ab554610bbce43756736f", "tree": "5af3dfc34b36fbee01ad90cb3e58bf582b565c1c", "parents": [ "23cafe75f421bf3057697c7444f82d0455d5273f", "a6da12c071375b7b8a607b4f27b21b6b0e29c65a" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 21:28:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 21:28:34 2010 -0700" }, "message": "am 2b2da526: Merge \"Add a test application to dump all the EGLConfig available\" into gingerbread\n\nMerge commit \u00272b2da52608303b149d22418865e67c8030c70e73\u0027 into gingerbread-plus-aosp\n\n* commit \u00272b2da52608303b149d22418865e67c8030c70e73\u0027:\n Add a test application to dump all the EGLConfig available\n" }, { "commit": "23cafe75f421bf3057697c7444f82d0455d5273f", "tree": "8e086b6aa66e2985a371786ab5f1b4cf4939bf46", "parents": [ "db02bde7887c74dd1def274f818d326cde11bd0a", "230fda781de850a41fce870dcf24892a70bafd12" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 21:28:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 21:28:29 2010 -0700" }, "message": "am 73655bd2: Merge \"propagate RS context priority to EGLContext when possible. DO NOT MERGE.\" into gingerbread\n\nMerge commit \u002773655bd2d303f8b3fe5c4bb0d8e4824361647381\u0027 into gingerbread-plus-aosp\n\n* commit \u002773655bd2d303f8b3fe5c4bb0d8e4824361647381\u0027:\n propagate RS context priority to EGLContext when possible. DO NOT MERGE.\n" }, { "commit": "db02bde7887c74dd1def274f818d326cde11bd0a", "tree": "8e086b6aa66e2985a371786ab5f1b4cf4939bf46", "parents": [ "3f9f60fa42fef63b57752377f00ed18f3df26b49", "3c85e4ad5a14a49fffcd458886cf7519276daed5" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 21:28:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 21:28:25 2010 -0700" }, "message": "am 583fefc8: Merge \"Use the context_priority extension when present.\" into gingerbread\n\nMerge commit \u0027583fefc8dcadecc7fc933513d3569dd9c16c100c\u0027 into gingerbread-plus-aosp\n\n* commit \u0027583fefc8dcadecc7fc933513d3569dd9c16c100c\u0027:\n Use the context_priority extension when present.\n" }, { "commit": "81b5fbfdacbd36b1379638a4bacd55a6ffee3647", "tree": "ae3488c1ca8e659a38615136acf91735e55722bc", "parents": [ "a6da12c071375b7b8a607b4f27b21b6b0e29c65a", "1aedd5613e223409dafb0940cf05f2d8c31886fc" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 20 20:07:57 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 20:07:57 2010 -0700" }, "message": "Merge \"File writer size estimation improvement\" into gingerbread" }, { "commit": "a6da12c071375b7b8a607b4f27b21b6b0e29c65a", "tree": "ae3488c1ca8e659a38615136acf91735e55722bc", "parents": [ "230fda781de850a41fce870dcf24892a70bafd12", "16a3e39cc007ebf7c7ee38d7464f99efed3e2574" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 20:05:28 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 20:05:28 2010 -0700" }, "message": "Merge \"Add a test application to dump all the EGLConfig available\" into gingerbread" }, { "commit": "230fda781de850a41fce870dcf24892a70bafd12", "tree": "6abde4a3069161c1ed7351d6f2a0c974323efb10", "parents": [ "3c85e4ad5a14a49fffcd458886cf7519276daed5", "67226814e1b6d1c02079635608444e73ec658837" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 20:04:52 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 20:04:52 2010 -0700" }, "message": "Merge \"propagate RS context priority to EGLContext when possible. DO NOT MERGE.\" into gingerbread" }, { "commit": "3c85e4ad5a14a49fffcd458886cf7519276daed5", "tree": "6abde4a3069161c1ed7351d6f2a0c974323efb10", "parents": [ "6d44a8718a9edce778aae87363b36e039c9dcfa7", "67226814e1b6d1c02079635608444e73ec658837" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 20:04:45 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 20:04:46 2010 -0700" }, "message": "Merge \"Use the context_priority extension when present.\" into gingerbread" }, { "commit": "3f9f60fa42fef63b57752377f00ed18f3df26b49", "tree": "4170620cf9153b9cc933a0a251501e83325d3baf", "parents": [ "e2fa4bc12c06c140d227afef71228103963effdc", "6d44a8718a9edce778aae87363b36e039c9dcfa7" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 18:22:17 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 18:22:17 2010 -0700" }, "message": "am a0795fc9: Merge \"software renderer: fix [3117351] GL driver doesn\\\u0027t set the EGL_NATIVE_VISUAL_ID\" into gingerbread\n\nMerge commit \u0027a0795fc9bdf97703780cbf0ec47c06eccb642e72\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a0795fc9bdf97703780cbf0ec47c06eccb642e72\u0027:\n software renderer: fix [3117351] GL driver doesn\u0027t set the EGL_NATIVE_VISUAL_ID\n" }, { "commit": "e2fa4bc12c06c140d227afef71228103963effdc", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "034cf4281f7aeba4ecbff4b902f3276940a94b48", "745d655cad4549254b6d63f0972ec0e1d5a533ef" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Oct 20 18:16:57 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Oct 20 18:16:57 2010 -0700" }, "message": "resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp\n\nChange-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d\n" }, { "commit": "6d44a8718a9edce778aae87363b36e039c9dcfa7", "tree": "c0914ee15fdad775c1da2aadfc7916a4698347b7", "parents": [ "b56d2f1a469f074dfc90871a8598169b863fce13", "d8e5ceb963c9bd3cba5c307aef481ded7859ef79" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 18:00:43 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 18:00:43 2010 -0700" }, "message": "Merge \"software renderer: fix [3117351] GL driver doesn\u0027t set the EGL_NATIVE_VISUAL_ID\" into gingerbread" }, { "commit": "d8e5ceb963c9bd3cba5c307aef481ded7859ef79", "tree": "c0914ee15fdad775c1da2aadfc7916a4698347b7", "parents": [ "a6484519451bffa0ff88dbaee3a1a3175dd876ae" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 17:21:43 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 17:21:43 2010 -0700" }, "message": "software renderer: fix [3117351] GL driver doesn\u0027t set the EGL_NATIVE_VISUAL_ID\n\nChange-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf\n" }, { "commit": "034cf4281f7aeba4ecbff4b902f3276940a94b48", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "121d99794eb50a33d6e886f5363dceb2017bf2a1", "b56d2f1a469f074dfc90871a8598169b863fce13" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Oct 20 17:14:59 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 17:14:59 2010 -0700" }, "message": "am fb2cd0aa: Merge \"Fix java doc on FLAG_EXTERNAL.\" into gingerbread\n\nMerge commit \u0027fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de\u0027 into gingerbread-plus-aosp\n\n* commit \u0027fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de\u0027:\n Fix java doc on FLAG_EXTERNAL.\n" }, { "commit": "b56d2f1a469f074dfc90871a8598169b863fce13", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "6962e7ccf2058824d65bb09724f2356eb53af457", "a6484519451bffa0ff88dbaee3a1a3175dd876ae" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Oct 20 17:12:27 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 17:12:27 2010 -0700" }, "message": "Merge \"Fix java doc on FLAG_EXTERNAL.\" into gingerbread" }, { "commit": "16a3e39cc007ebf7c7ee38d7464f99efed3e2574", "tree": "731fe9e770ec32399965c05684588b51175e9613", "parents": [ "a6484519451bffa0ff88dbaee3a1a3175dd876ae" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 17:10:47 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 20 17:10:47 2010 -0700" }, "message": "Add a test application to dump all the EGLConfig available\n\nChange-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa\n" }, { "commit": "745d655cad4549254b6d63f0972ec0e1d5a533ef", "tree": "a298995a015476dc711bb2aa6287775665e02d2c", "parents": [ "333874a009b1c55847a5666846f05d0e831ba153", "1ad3f53d7ca1441af3098e4ac6cc9d50ddb720fa" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Oct 20 16:46:52 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Wed Oct 20 16:46:52 2010 -0700" }, "message": "Merge \"Make disabled TextViews uneditable\"" }, { "commit": "121d99794eb50a33d6e886f5363dceb2017bf2a1", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "fd9feaf3841d4e67139dc83042bc99a734569acb", "333874a009b1c55847a5666846f05d0e831ba153" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Oct 20 16:45:50 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 16:45:50 2010 -0700" }, "message": "am 5bfef1ba: Merge \"BatteryService: Set bool to true if sysfs entry is not 0\"\n\nMerge commit \u00275bfef1ba0501e237b3a0fa1abe98e5348d8c5b04\u0027 into gingerbread-plus-aosp\n\n* commit \u00275bfef1ba0501e237b3a0fa1abe98e5348d8c5b04\u0027:\n BatteryService: Set bool to true if sysfs entry is not 0\n" }, { "commit": "333874a009b1c55847a5666846f05d0e831ba153", "tree": "a298995a015476dc711bb2aa6287775665e02d2c", "parents": [ "2be16c5eadabf06ec2da6522f56dc628d7256490", "1ad3f53d7ca1441af3098e4ac6cc9d50ddb720fa" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Oct 20 16:35:17 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Wed Oct 20 16:35:17 2010 -0700" }, "message": "Merge \"BatteryService: Set bool to true if sysfs entry is not 0\"" }, { "commit": "fd9feaf3841d4e67139dc83042bc99a734569acb", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "3d9ee79ff96ea4448cd0e0942c579896d2e1935c", "2be16c5eadabf06ec2da6522f56dc628d7256490" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Oct 20 16:33:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 16:33:51 2010 -0700" }, "message": "am 81925e66: Merge \"Fix FastScroller overlay position bug after setFastScrollEnabled(false)--\u003esetFastScrollEnabled(true) the overlay shows up at the top-left instead of center\"\n\nMerge commit \u002781925e665c1e25d04cbc10e7333e793416bdc98f\u0027 into gingerbread-plus-aosp\n\n* commit \u002781925e665c1e25d04cbc10e7333e793416bdc98f\u0027:\n Fix FastScroller overlay position bug\n" }, { "commit": "2be16c5eadabf06ec2da6522f56dc628d7256490", "tree": "a298995a015476dc711bb2aa6287775665e02d2c", "parents": [ "2387e907c4e40cfb712d49d9bd75cbf05932825f", "1ad3f53d7ca1441af3098e4ac6cc9d50ddb720fa" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Oct 20 16:29:15 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Wed Oct 20 16:29:15 2010 -0700" }, "message": "Merge \"Fix FastScroller overlay position bug after setFastScrollEnabled(false)--\u003esetFastScrollEnabled(true) the overlay shows up at the top-left instead of center\"" }, { "commit": "3d9ee79ff96ea4448cd0e0942c579896d2e1935c", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "23edfba77634c648e47a26983af5a042228b8e48", "6962e7ccf2058824d65bb09724f2356eb53af457" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 20 14:13:21 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 14:13:21 2010 -0700" }, "message": "am ddf8fe50: Merge \"Fix isUsbMassStorageConnected() will always return true\" into gingerbread\n\nMerge commit \u0027ddf8fe505636d3b4435cb9952266765aab20b86d\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ddf8fe505636d3b4435cb9952266765aab20b86d\u0027:\n Fix isUsbMassStorageConnected() will always return true\n" }, { "commit": "23edfba77634c648e47a26983af5a042228b8e48", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "2fa7514bf85319580633d26fafafadd5a52a7317", "17e20de2753a486216d539e4714bf20f839a4d1e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Oct 20 14:10:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 14:10:29 2010 -0700" }, "message": "am e9e23405: Merge \"Fix issue #3113424: Battery stats don\\\u0027t reset on Crespo\" into gingerbread\n\nMerge commit \u0027e9e23405833a5fedb6a1c2dcec87d84e39d1d13d\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e9e23405833a5fedb6a1c2dcec87d84e39d1d13d\u0027:\n Fix issue #3113424: Battery stats don\u0027t reset on Crespo\n" }, { "commit": "6962e7ccf2058824d65bb09724f2356eb53af457", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "17e20de2753a486216d539e4714bf20f839a4d1e", "89b8c939c424258f489201c5561d778698636e01" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 20 14:10:00 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 14:10:00 2010 -0700" }, "message": "Merge \"Fix isUsbMassStorageConnected() will always return true\" into gingerbread" }, { "commit": "17e20de2753a486216d539e4714bf20f839a4d1e", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "121c22ed166f4f9ecdfec374741f9b55bb8eb416", "a6484519451bffa0ff88dbaee3a1a3175dd876ae" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Oct 20 14:08:26 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 14:08:26 2010 -0700" }, "message": "Merge \"Fix issue #3113424: Battery stats don\u0027t reset on Crespo\" into gingerbread" }, { "commit": "2fa7514bf85319580633d26fafafadd5a52a7317", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "e9bf8f289c5edd4c89a7c1bf4a5815821b08587c", "121c22ed166f4f9ecdfec374741f9b55bb8eb416" ], "author": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Wed Oct 20 14:04:00 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 14:04:00 2010 -0700" }, "message": "am d5aaff54: Merge \"DO NOT MERGE - Updated media playback transport controls (b/3116268)\" into gingerbread\n\nMerge commit \u0027d5aaff548d62c07fb5fb2d47e58161e77c401616\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d5aaff548d62c07fb5fb2d47e58161e77c401616\u0027:\n DO NOT MERGE - Updated media playback transport controls (b/3116268)\n" }, { "commit": "e9bf8f289c5edd4c89a7c1bf4a5815821b08587c", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "a1d13cbc2206a502c944b3e912d38996f0103675", "d33ad71a3c540df7999d38525e4d38771e6a9375" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 14:03:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 14:03:54 2010 -0700" }, "message": "am 4056ab97: Merge \"Add permission requirements to SipAudioCall and SipManager javadoc.\" into gingerbread\n\nMerge commit \u00274056ab97be6224dcc00ac70843544790f2d65fb7\u0027 into gingerbread-plus-aosp\n\n* commit \u00274056ab97be6224dcc00ac70843544790f2d65fb7\u0027:\n Add permission requirements to SipAudioCall and SipManager javadoc.\n" }, { "commit": "a1d13cbc2206a502c944b3e912d38996f0103675", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "97d3435086c9f4cebc0205eca0fa6ec61dfc5b93", "a6484519451bffa0ff88dbaee3a1a3175dd876ae" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 14:03:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 14:03:43 2010 -0700" }, "message": "am 6037a056: Fix n-way conf call in SipPhone.\n\nMerge commit \u00276037a056ea0dda27a286ddcb527b323b58a1c7c7\u0027 into gingerbread-plus-aosp\n\n* commit \u00276037a056ea0dda27a286ddcb527b323b58a1c7c7\u0027:\n Fix n-way conf call in SipPhone.\n" }, { "commit": "97d3435086c9f4cebc0205eca0fa6ec61dfc5b93", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "f38409d27e7e057261235c2d2c4283160059f5b8", "a6484519451bffa0ff88dbaee3a1a3175dd876ae" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Wed Oct 20 13:57:26 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 13:57:26 2010 -0700" }, "message": "am 23392a84: Fix the build.\n\nMerge commit \u002723392a84bcb961d3fd50142ec40ce6ac6db89018\u0027 into gingerbread-plus-aosp\n\n* commit \u002723392a84bcb961d3fd50142ec40ce6ac6db89018\u0027:\n Fix the build.\n" }, { "commit": "f38409d27e7e057261235c2d2c4283160059f5b8", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "31251614b9c73adf851f04210e5b7efdf177b040", "a6484519451bffa0ff88dbaee3a1a3175dd876ae" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 13:57:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 13:57:20 2010 -0700" }, "message": "am 6fe795ec: Do another contact lookup if the first one fails and...\n\nMerge commit \u00276fe795ecd35c4d49822d349424fc71b660577dfc\u0027 into gingerbread-plus-aosp\n\n* commit \u00276fe795ecd35c4d49822d349424fc71b660577dfc\u0027:\n Do another contact lookup if the first one fails and...\n" }, { "commit": "31251614b9c73adf851f04210e5b7efdf177b040", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "3124721b391ac472e2accf9d82a635d47757726e", "a6484519451bffa0ff88dbaee3a1a3175dd876ae" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 13:56:59 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 13:56:59 2010 -0700" }, "message": "am baced375: Merge \"Silently reject a ringing call when another call is dialing/ringing.\" into gingerbread\n\nMerge commit \u0027baced375ba5f374445c44a2115700d69693794a0\u0027 into gingerbread-plus-aosp\n\n* commit \u0027baced375ba5f374445c44a2115700d69693794a0\u0027:\n Silently reject a ringing call when another call is dialing/ringing.\n" }, { "commit": "3124721b391ac472e2accf9d82a635d47757726e", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "91459a151fddb67fa424ab89e5f8440322892c9a", "2a9c6d09136a3d89b14cbfaaf9dcb58edc84cf7b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Oct 20 13:56:03 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 13:56:03 2010 -0700" }, "message": "am 74b1ed32: Fix issue #3113219: NativeActivity using wrong lib path with Java code\n\nMerge commit \u002774b1ed3231b8cafcf4e5cb3f03d794acd5080004\u0027 into gingerbread-plus-aosp\n\n* commit \u002774b1ed3231b8cafcf4e5cb3f03d794acd5080004\u0027:\n Fix issue #3113219: NativeActivity using wrong lib path with Java code\n" }, { "commit": "91459a151fddb67fa424ab89e5f8440322892c9a", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "4272310f5fc94735123f6abd6dbaeb13f4670676", "2a9c6d09136a3d89b14cbfaaf9dcb58edc84cf7b" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 13:54:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 13:54:25 2010 -0700" }, "message": "am 1180f2a0: Merge \"Remove ringtone API from SipAudioCall.\" into gingerbread\n\nMerge commit \u00271180f2a099a134c40f923c7e4162a5e7d7ca0184\u0027 into gingerbread-plus-aosp\n\n* commit \u00271180f2a099a134c40f923c7e4162a5e7d7ca0184\u0027:\n Remove ringtone API from SipAudioCall.\n" }, { "commit": "4272310f5fc94735123f6abd6dbaeb13f4670676", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "c1820600b30fac54f918b9e2dd76ab2ef403ae8a", "bcb743a1f5b2020afe143d040f53fa75250add26" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Oct 20 13:54:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 13:54:09 2010 -0700" }, "message": "am 3466e1fc: Merge \"Doc change: escape angle brackets in javadoc comment.\" into gingerbread\n\nMerge commit \u00273466e1fc6db1fed35e2707c67a9ab17673aaf9de\u0027 into gingerbread-plus-aosp\n\n* commit \u00273466e1fc6db1fed35e2707c67a9ab17673aaf9de\u0027:\n Doc change: escape angle brackets in javadoc comment.\n" }, { "commit": "121c22ed166f4f9ecdfec374741f9b55bb8eb416", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "d33ad71a3c540df7999d38525e4d38771e6a9375", "59c4f35280148f195084988e0cdafc338ec964b9" ], "author": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Wed Oct 20 13:35:40 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 13:35:40 2010 -0700" }, "message": "Merge \"DO NOT MERGE - Updated media playback transport controls (b/3116268)\" into gingerbread" }, { "commit": "d33ad71a3c540df7999d38525e4d38771e6a9375", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "a6484519451bffa0ff88dbaee3a1a3175dd876ae" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 13:28:02 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 13:28:02 2010 -0700" }, "message": "Merge \"Add permission requirements to SipAudioCall and SipManager javadoc.\" into gingerbread" }, { "commit": "a6484519451bffa0ff88dbaee3a1a3175dd876ae", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "2a9c6d09136a3d89b14cbfaaf9dcb58edc84cf7b" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 11:49:26 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 11:49:26 2010 -0700" }, "message": "Merge \"Silently reject a ringing call when another call is dialing/ringing.\" into gingerbread" }, { "commit": "2a9c6d09136a3d89b14cbfaaf9dcb58edc84cf7b", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "bcb743a1f5b2020afe143d040f53fa75250add26", "89b8c939c424258f489201c5561d778698636e01" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 09:47:45 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 09:47:45 2010 -0700" }, "message": "Merge \"Remove ringtone API from SipAudioCall.\" into gingerbread" }, { "commit": "bcb743a1f5b2020afe143d040f53fa75250add26", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "89b8c939c424258f489201c5561d778698636e01", "ecbb38c225831da5eccaa5af6855af86b33fbc59" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Oct 20 09:34:24 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 20 09:34:24 2010 -0700" }, "message": "Merge \"Doc change: escape angle brackets in javadoc comment.\" into gingerbread" }, { "commit": "c1820600b30fac54f918b9e2dd76ab2ef403ae8a", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "309be7131f8a969fb3715665fba389f0ac9f3852", "89b8c939c424258f489201c5561d778698636e01" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Oct 19 23:03:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 23:03:25 2010 -0700" }, "message": "am b595e094: Merge \"Return display name in SipConnection.getCnapName().\" into gingerbread\n\nMerge commit \u0027b595e094e3901ff8a224eaf7d4869e7d2e5649dd\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b595e094e3901ff8a224eaf7d4869e7d2e5649dd\u0027:\n Return display name in SipConnection.getCnapName().\n" }, { "commit": "89b8c939c424258f489201c5561d778698636e01", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "1aedd5613e223409dafb0940cf05f2d8c31886fc", "5522e5f34cb2489647940926d9828aa0f038d854" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Oct 19 23:00:16 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 19 23:00:16 2010 -0700" }, "message": "Merge \"Return display name in SipConnection.getCnapName().\" into gingerbread" }, { "commit": "309be7131f8a969fb3715665fba389f0ac9f3852", "tree": "f5b1799976c978d04a73b8897d6b2152e23a020a", "parents": [ "2758ba9e700b202d03648a2fe431ecbb2b6053f0", "1aedd5613e223409dafb0940cf05f2d8c31886fc" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 19 18:26:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 18:26:28 2010 -0700" }, "message": "am f4cd9be0: Merge \"fix [2236865] STOPSHIP: bump soft gl and egl minor version number\" into gingerbread\n\nMerge commit \u0027f4cd9be0390135269e22e42fd2e1fe61fdcf9863\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f4cd9be0390135269e22e42fd2e1fe61fdcf9863\u0027:\n fix [2236865] STOPSHIP: bump soft gl and egl minor version number\n" }, { "commit": "1aedd5613e223409dafb0940cf05f2d8c31886fc", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "512445175577b3e11f30c7fc4b8879067225b12e", "141550bc18f670f7e7ec65fc25363da3dd35d52e" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 19 18:23:19 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 19 18:23:19 2010 -0700" }, "message": "Merge \"fix [2236865] STOPSHIP: bump soft gl and egl minor version number\" into gingerbread" }, { "commit": "2758ba9e700b202d03648a2fe431ecbb2b6053f0", "tree": "771ad51db849c171e622e52b5209cd779e827911", "parents": [ "4777d13350d1958caf16c5c4f6e018d1c7c280ef", "512445175577b3e11f30c7fc4b8879067225b12e" ], "author": { "name": "Mindy Pereira", "email": "mindyp@google.com", "time": "Tue Oct 19 18:23:18 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 18:23:18 2010 -0700" }, "message": "am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.\n\nMerge commit \u00276fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1\u0027 into gingerbread-plus-aosp\n\n* commit \u00276fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1\u0027:\n DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.\n" }, { "commit": "4777d13350d1958caf16c5c4f6e018d1c7c280ef", "tree": "771ad51db849c171e622e52b5209cd779e827911", "parents": [ "82bedafd08fecb3969484aa5bc4f1680c6d12362", "512445175577b3e11f30c7fc4b8879067225b12e" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Oct 19 17:43:37 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 17:43:37 2010 -0700" }, "message": "am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image\n\nMerge commit \u0027218bf88446d01fb2f8d79eec3be59bee995f9cb0\u0027 into gingerbread-plus-aosp\n\n* commit \u0027218bf88446d01fb2f8d79eec3be59bee995f9cb0\u0027:\n docs: add note to froyo platform doc that not all locales are included in the sdk image\n" }, { "commit": "512445175577b3e11f30c7fc4b8879067225b12e", "tree": "d24993974d1cc8683f67743bba744b0b9e8647f2", "parents": [ "59c4f35280148f195084988e0cdafc338ec964b9", "23e026b474b5597d63c429a1821ef73656c7fff8" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Tue Oct 19 17:29:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 17:29:29 2010 -0700" }, "message": "am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image\n\nMerge commit \u0027a6df4b1bfdb8de7de9b52bee4d01c65941f2d722\u0027 into gingerbread\n\n* commit \u0027a6df4b1bfdb8de7de9b52bee4d01c65941f2d722\u0027:\n docs: add note to froyo platform doc that not all locales are included in the sdk image\n" }, { "commit": "82bedafd08fecb3969484aa5bc4f1680c6d12362", "tree": "771ad51db849c171e622e52b5209cd779e827911", "parents": [ "343236b2f3b811b11aa23bdce6a0a8c5c73cff0b", "2387e907c4e40cfb712d49d9bd75cbf05932825f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Oct 19 15:22:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 15:22:13 2010 -0700" }, "message": "am db723ea0: Merge \"jni: Remove duplicated jniThrowException()\"\n\nMerge commit \u0027db723ea0f70392f712542edb1114fc15e782cdb7\u0027 into gingerbread-plus-aosp\n\n* commit \u0027db723ea0f70392f712542edb1114fc15e782cdb7\u0027:\n jni: Remove duplicated jniThrowException()\n" }, { "commit": "141550bc18f670f7e7ec65fc25363da3dd35d52e", "tree": "2be6180be2c505895805cf583c10f2640c03b8af", "parents": [ "59c4f35280148f195084988e0cdafc338ec964b9" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 19 14:47:08 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 19 14:47:08 2010 -0700" }, "message": "fix [2236865] STOPSHIP: bump soft gl and egl minor version number\n\nChange-Id: Ibf46b18d7493348e189f2c93e969a6cac61f68b5\n" }, { "commit": "2387e907c4e40cfb712d49d9bd75cbf05932825f", "tree": "a298995a015476dc711bb2aa6287775665e02d2c", "parents": [ "1ad3f53d7ca1441af3098e4ac6cc9d50ddb720fa" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Oct 19 14:42:52 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Tue Oct 19 14:42:52 2010 -0700" }, "message": "Merge \"jni: Remove duplicated jniThrowException()\"" }, { "commit": "343236b2f3b811b11aa23bdce6a0a8c5c73cff0b", "tree": "771ad51db849c171e622e52b5209cd779e827911", "parents": [ "d04bc8b1e14fefc8c9bff528a81bbed38811da7e", "59c4f35280148f195084988e0cdafc338ec964b9" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Tue Oct 19 14:17:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 14:17:44 2010 -0700" }, "message": "am 4944fdd7: Periodically scan wifi when wifi is not connected and wifi lock is grabbed in SipService.\n\nMerge commit \u00274944fdd771d2a629b3c1af8097df5eb2de02d9ee\u0027 into gingerbread-plus-aosp\n\n* commit \u00274944fdd771d2a629b3c1af8097df5eb2de02d9ee\u0027:\n Periodically scan wifi when wifi is not connected and wifi lock is\n" }, { "commit": "d04bc8b1e14fefc8c9bff528a81bbed38811da7e", "tree": "771ad51db849c171e622e52b5209cd779e827911", "parents": [ "8ccce0fdbc1a1cb3b9eb185993b6338c134bec00", "59c4f35280148f195084988e0cdafc338ec964b9" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Oct 19 14:14:15 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 14:14:15 2010 -0700" }, "message": "am 0a6e717f: Handle dialing a SIP call to self.\n\nMerge commit \u00270a6e717fb6846f66b8dc853e079f2166307bfc60\u0027 into gingerbread-plus-aosp\n\n* commit \u00270a6e717fb6846f66b8dc853e079f2166307bfc60\u0027:\n Handle dialing a SIP call to self.\n" }, { "commit": "8ccce0fdbc1a1cb3b9eb185993b6338c134bec00", "tree": "771ad51db849c171e622e52b5209cd779e827911", "parents": [ "ef156e6ab6c79c1ef9058c3b8641e71d6cbc29b7", "59c4f35280148f195084988e0cdafc338ec964b9" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Oct 19 12:44:19 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 12:44:19 2010 -0700" }, "message": "am 59993d9b: Merge \"Avoid NPE in WebTextView.lineUpScroll -\u003e Touch.getMaxScrollX\" into gingerbread\n\nMerge commit \u002759993d9bc589089e6be55371c6536a42afe21a64\u0027 into gingerbread-plus-aosp\n\n* commit \u002759993d9bc589089e6be55371c6536a42afe21a64\u0027:\n Avoid NPE in WebTextView.lineUpScroll -\u003e Touch.getMaxScrollX\n" }, { "commit": "59c4f35280148f195084988e0cdafc338ec964b9", "tree": "d24993974d1cc8683f67743bba744b0b9e8647f2", "parents": [ "b99cc1dcf36d1b47a9bc2f975cef7f29496eaac1", "8e8732bfa9c7235f5627b47b4cc5d8807c459004" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Oct 19 12:40:53 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 19 12:40:53 2010 -0700" }, "message": "Merge \"Avoid NPE in WebTextView.lineUpScroll -\u003e Touch.getMaxScrollX\" into gingerbread" }, { "commit": "ef156e6ab6c79c1ef9058c3b8641e71d6cbc29b7", "tree": "771ad51db849c171e622e52b5209cd779e827911", "parents": [ "42b6a23ef35345fa8a00c36bf6a25d8f97aaf7c9", "b99cc1dcf36d1b47a9bc2f975cef7f29496eaac1" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Oct 19 12:29:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 12:29:43 2010 -0700" }, "message": "am bdf1706a: Merge \"Reduce logging.\" into gingerbread\n\nMerge commit \u0027bdf1706ac680c0fe74765b8d6d34823b8ac05306\u0027 into gingerbread-plus-aosp\n\n* commit \u0027bdf1706ac680c0fe74765b8d6d34823b8ac05306\u0027:\n Reduce logging.\n" }, { "commit": "42b6a23ef35345fa8a00c36bf6a25d8f97aaf7c9", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "eba63fd6f6e25d914d37e30486426f9524f69191", "8e8732bfa9c7235f5627b47b4cc5d8807c459004" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Oct 19 12:25:46 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 12:25:46 2010 -0700" }, "message": "am 987e8d7f: Merge \"Fix Vibrator permission CTS test broken earlier.\" into gingerbread\n\nMerge commit \u0027987e8d7f9748018d3fee5778645b267a9ee06ff6\u0027 into gingerbread-plus-aosp\n\n* commit \u0027987e8d7f9748018d3fee5778645b267a9ee06ff6\u0027:\n Fix Vibrator permission CTS test broken earlier.\n" }, { "commit": "b99cc1dcf36d1b47a9bc2f975cef7f29496eaac1", "tree": "d24993974d1cc8683f67743bba744b0b9e8647f2", "parents": [ "8e8732bfa9c7235f5627b47b4cc5d8807c459004", "fc1a4df52346dae7dbf5928a878156ceca002148" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Oct 19 12:23:51 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 19 12:23:51 2010 -0700" }, "message": "Merge \"Reduce logging.\" into gingerbread" }, { "commit": "8e8732bfa9c7235f5627b47b4cc5d8807c459004", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "7961f288be2788d421d021b8535b1952105ae296" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Oct 19 12:12:31 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 19 12:12:31 2010 -0700" }, "message": "Merge \"Fix Vibrator permission CTS test broken earlier.\" into gingerbread" }, { "commit": "fc1a4df52346dae7dbf5928a878156ceca002148", "tree": "d24993974d1cc8683f67743bba744b0b9e8647f2", "parents": [ "7961f288be2788d421d021b8535b1952105ae296" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Mon Oct 18 19:13:23 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Oct 19 15:08:05 2010 -0400" }, "message": "Reduce logging.\n\nRemember, the system and main logs are\n - Shared resources\n - Primarily for recording problems\n - To be used only for large grained events during normal operation\n\nBug: 3104855\nChange-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7\n" }, { "commit": "eba63fd6f6e25d914d37e30486426f9524f69191", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "15fc430e9aa6517a14160a5651a785c662a25885", "7961f288be2788d421d021b8535b1952105ae296" ], "author": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Tue Oct 19 12:04:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 12:04:44 2010 -0700" }, "message": "am 18580319: DO NOT MERGE. Turn down backup logging for release.\n\nMerge commit \u00271858031946b3627b599475c5894655362e510351\u0027 into gingerbread-plus-aosp\n\n* commit \u00271858031946b3627b599475c5894655362e510351\u0027:\n DO NOT MERGE. Turn down backup logging for release.\n" }, { "commit": "15fc430e9aa6517a14160a5651a785c662a25885", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "076f48745409a7239bb66aba66ca5eef16ca4a9b", "7961f288be2788d421d021b8535b1952105ae296" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 19 10:08:32 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 10:08:32 2010 -0700" }, "message": "am 52bea277: Merge \"If we encounter video stream EOS while seeking we may still need to seek audio.\" into gingerbread\n\nMerge commit \u002752bea277ff92a2a1780e035c82c72082434e7b16\u0027 into gingerbread-plus-aosp\n\n* commit \u002752bea277ff92a2a1780e035c82c72082434e7b16\u0027:\n If we encounter video stream EOS while seeking we may still need to seek audio.\n" }, { "commit": "7961f288be2788d421d021b8535b1952105ae296", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "bfa020c524831d2c9cb93efa52a38c994fe9adad", "40d489376906d2fcae13ee45825f7391727bcb5e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 19 09:59:01 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 19 09:59:01 2010 -0700" }, "message": "Merge \"If we encounter video stream EOS while seeking we may still need to seek audio.\" into gingerbread" }, { "commit": "076f48745409a7239bb66aba66ca5eef16ca4a9b", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "cef935105ce2e98c679dba620073ea295219c8c1", "bfa020c524831d2c9cb93efa52a38c994fe9adad" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 19 09:33:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 09:33:30 2010 -0700" }, "message": "am 928b0748: Merge \"Don\\\u0027t symlink native library paths for old apps\" into gingerbread\n\nMerge commit \u0027928b07480bc5372f2b959bce7b4a3b49651b49b8\u0027 into gingerbread-plus-aosp\n\n* commit \u0027928b07480bc5372f2b959bce7b4a3b49651b49b8\u0027:\n Don\u0027t symlink native library paths for old apps\n" }, { "commit": "bfa020c524831d2c9cb93efa52a38c994fe9adad", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "40d489376906d2fcae13ee45825f7391727bcb5e", "8a1c39374ca30e3aa8af6a96b81f2bddb3fb6ba2" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 19 09:28:28 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 19 09:28:28 2010 -0700" }, "message": "Merge \"Don\u0027t symlink native library paths for old apps\" into gingerbread" }, { "commit": "cef935105ce2e98c679dba620073ea295219c8c1", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "939e80d0d073e69e912015dde880c07590d25a37", "40d489376906d2fcae13ee45825f7391727bcb5e" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Tue Oct 19 08:44:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 08:44:13 2010 -0700" }, "message": "am f73d48d7: Merge \"Fix some camera orientation javadoc errors.\" into gingerbread\n\nMerge commit \u0027f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f\u0027:\n Fix some camera orientation javadoc errors.\n" }, { "commit": "40d489376906d2fcae13ee45825f7391727bcb5e", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "5522e5f34cb2489647940926d9828aa0f038d854" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Tue Oct 19 07:54:17 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 19 07:54:17 2010 -0700" }, "message": "Merge \"Fix some camera orientation javadoc errors.\" into gingerbread" }, { "commit": "939e80d0d073e69e912015dde880c07590d25a37", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "a5bea70200de650bb9b4fdca2310cff0f205e01f", "5522e5f34cb2489647940926d9828aa0f038d854" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Mon Oct 18 23:21:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 23:21:11 2010 -0700" }, "message": "am b4116c09: Fix the incorrect environment variable name for the thread pool size.\n\nMerge commit \u0027b4116c09fb9784551911ea0a10b4dd321ff9aa7d\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b4116c09fb9784551911ea0a10b4dd321ff9aa7d\u0027:\n Fix the incorrect environment variable name for the thread pool size.\n" }, { "commit": "a5bea70200de650bb9b4fdca2310cff0f205e01f", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "174b5062c7776acba018f12cca9a22419a0cf682", "5522e5f34cb2489647940926d9828aa0f038d854" ], "author": { "name": "Sylvain Fonteneau", "email": "sylvain.fonteneau@trusted-logic.com", "time": "Mon Oct 18 19:13:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 19:13:29 2010 -0700" }, "message": "am dd7341f7: Added missing implementation for NdefRecord.\n\nMerge commit \u0027dd7341f775ca4d86091f4106d6dfef9214073a7d\u0027 into gingerbread-plus-aosp\n\n* commit \u0027dd7341f775ca4d86091f4106d6dfef9214073a7d\u0027:\n Added missing implementation for NdefRecord.\n" }, { "commit": "174b5062c7776acba018f12cca9a22419a0cf682", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "73b4c4023e6656d1848977e8681de6982330785b", "5522e5f34cb2489647940926d9828aa0f038d854" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 18 18:58:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 18:58:06 2010 -0700" }, "message": "am 453c6d44: add api level 9 \\\u0027since\\\u0027 flag to docs\n\nMerge commit \u0027453c6d449b6469dde9aae6044dedfe3be0da76c5\u0027 into gingerbread-plus-aosp\n\n* commit \u0027453c6d449b6469dde9aae6044dedfe3be0da76c5\u0027:\n add api level 9 \u0027since\u0027 flag to docs\n" }, { "commit": "73b4c4023e6656d1848977e8681de6982330785b", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "221634f6335b34cd4cd356feebe96ee59c2abf6e", "5522e5f34cb2489647940926d9828aa0f038d854" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 18 18:41:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 18:41:12 2010 -0700" }, "message": "am 3d2818d3: Remove public resource padding.\n\nMerge commit \u00273d2818d34feab5a62dfb33452f99f2d3ca667cc8\u0027 into gingerbread-plus-aosp\n\n* commit \u00273d2818d34feab5a62dfb33452f99f2d3ca667cc8\u0027:\n Remove public resource padding.\n" }, { "commit": "221634f6335b34cd4cd356feebe96ee59c2abf6e", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "8043106caf55a12649ffc4bcd2adb5973fbaa10b", "5522e5f34cb2489647940926d9828aa0f038d854" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Oct 18 17:04:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 17:04:55 2010 -0700" }, "message": "am b4157a43: Merge \"StrictMode: fix docs to actually compile and add a utility method.\" into gingerbread\n\nMerge commit \u0027b4157a432cf791906d5b2f6d187f1767357a51bb\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b4157a432cf791906d5b2f6d187f1767357a51bb\u0027:\n StrictMode: fix docs to actually compile and add a utility method.\n" }, { "commit": "8043106caf55a12649ffc4bcd2adb5973fbaa10b", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "5a989fc34354b9f62715ee05199a79852f2a4828", "95ea513755af642bb11cbc6bae2d1965d2f00195" ], "author": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon Oct 18 17:04:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 17:04:47 2010 -0700" }, "message": "am 6b2274a1: Merge \"Don\\\u0027t force ended when full screen video is returned manually.\" into gingerbread\n\nMerge commit \u00276b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6\u0027 into gingerbread-plus-aosp\n\n* commit \u00276b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6\u0027:\n Don\u0027t force ended when full screen video is returned manually.\n" }, { "commit": "5522e5f34cb2489647940926d9828aa0f038d854", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "95ea513755af642bb11cbc6bae2d1965d2f00195", "77371310a6b0c86295eeb3dec63b58a006b4cd8f" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Oct 18 16:46:03 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 16:46:03 2010 -0700" }, "message": "Merge \"StrictMode: fix docs to actually compile and add a utility method.\" into gingerbread" }, { "commit": "95ea513755af642bb11cbc6bae2d1965d2f00195", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "77371310a6b0c86295eeb3dec63b58a006b4cd8f", "f0ab0edc19c841610ea0dc93e2891027e01e2d51" ], "author": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon Oct 18 16:40:25 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 16:40:25 2010 -0700" }, "message": "Merge \"Don\u0027t force ended when full screen video is returned manually.\" into gingerbread" }, { "commit": "5a989fc34354b9f62715ee05199a79852f2a4828", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "b78ea998ebeb14f19b86e77606fdb495d73857fd", "77371310a6b0c86295eeb3dec63b58a006b4cd8f" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 18 15:23:17 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 15:23:17 2010 -0700" }, "message": "am 2b51fcb9: Merge \"NFC: broadcast intent constants for adapter state change\" into gingerbread\n\nMerge commit \u00272b51fcb9ac80c7c42be8f53763773414ba9ca4fa\u0027 into gingerbread-plus-aosp\n\n* commit \u00272b51fcb9ac80c7c42be8f53763773414ba9ca4fa\u0027:\n NFC: broadcast intent constants for adapter state change\n" }, { "commit": "b78ea998ebeb14f19b86e77606fdb495d73857fd", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "8a779d00fa360caa6554fa05d03ca782f107e32a", "bbb2083f3312f145768557b19ecd4ca84bba48fe" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 18 15:20:36 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 15:20:36 2010 -0700" }, "message": "am 8f1e7b62: Merge \"Cleanspec to fix incremental build failures of the form:\" into gingerbread\n\nMerge commit \u00278f1e7b62d87b6e2f5fbc9609baf1dea7873218ce\u0027 into gingerbread-plus-aosp\n\n* commit \u00278f1e7b62d87b6e2f5fbc9609baf1dea7873218ce\u0027:\n Cleanspec to fix incremental build failures of the form:\n" }, { "commit": "8a779d00fa360caa6554fa05d03ca782f107e32a", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "c0bc4a3976095ea9efe48bb557953423afaf7a41", "5232a101ad3f4465a733d9ed1e36beb5ff14d2ca" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 15:20:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 15:20:31 2010 -0700" }, "message": "am 5d5a9db5: Merge \"GPS: Enable some more logging\" into gingerbread\n\nMerge commit \u00275d5a9db514a9cf42fbc189fc3af6da602d89b747\u0027 into gingerbread-plus-aosp\n\n* commit \u00275d5a9db514a9cf42fbc189fc3af6da602d89b747\u0027:\n GPS: Enable some more logging\n" }, { "commit": "77371310a6b0c86295eeb3dec63b58a006b4cd8f", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "bbb2083f3312f145768557b19ecd4ca84bba48fe", "8a1c39374ca30e3aa8af6a96b81f2bddb3fb6ba2" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 18 15:18:59 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 15:18:59 2010 -0700" }, "message": "Merge \"NFC: broadcast intent constants for adapter state change\" into gingerbread" }, { "commit": "bbb2083f3312f145768557b19ecd4ca84bba48fe", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "5232a101ad3f4465a733d9ed1e36beb5ff14d2ca", "8a1c39374ca30e3aa8af6a96b81f2bddb3fb6ba2" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 18 15:17:23 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 15:17:23 2010 -0700" }, "message": "Merge \"Cleanspec to fix incremental build failures of the form:\" into gingerbread" }, { "commit": "c0bc4a3976095ea9efe48bb557953423afaf7a41", "tree": "ccc2e69bb92259cb595ebc0359809599dcc39cbe", "parents": [ "cd7063515e48f44255f25c9de630be531e0e7222", "d88671ab8cf6c54ecfcb826fa3db58e9a96c8541" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 18 15:17:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 15:17:12 2010 -0700" }, "message": "am 7689dd49: Merge \"Fix bug where home presses were not poking user activity.\" into gingerbread\n\nMerge commit \u00277689dd4928d1cc4080e43f83a523521b5ecf44e5\u0027 into gingerbread-plus-aosp\n\n* commit \u00277689dd4928d1cc4080e43f83a523521b5ecf44e5\u0027:\n Fix bug where home presses were not poking user activity.\n" }, { "commit": "cd7063515e48f44255f25c9de630be531e0e7222", "tree": "019ca26084abbcccb357df956b5df2b574c4e8e2", "parents": [ "64cedc1abe79935a10b52f43b15213323ebf1a18", "92866ad00b01db67ea11828391c6aecb4232c2d8" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 18 15:17:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 15:17:07 2010 -0700" }, "message": "am d68cda47: An attempt to unregister a handler that\\\u0027s no longer registered should not cause an assertion.\n\nMerge commit \u0027d68cda472a3646966a203338ccac04f0783293b7\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d68cda472a3646966a203338ccac04f0783293b7\u0027:\n An attempt to unregister a handler that\u0027s no longer registered should not cause an assertion.\n" }, { "commit": "5232a101ad3f4465a733d9ed1e36beb5ff14d2ca", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "d88671ab8cf6c54ecfcb826fa3db58e9a96c8541", "8a1c39374ca30e3aa8af6a96b81f2bddb3fb6ba2" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 15:14:46 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 15:14:46 2010 -0700" }, "message": "Merge \"GPS: Enable some more logging\" into gingerbread" }, { "commit": "d88671ab8cf6c54ecfcb826fa3db58e9a96c8541", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "92866ad00b01db67ea11828391c6aecb4232c2d8", "ef3a8234824cc9f7c3464dd05f9aeca8ea77ebd9" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 18 15:13:33 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 15:13:33 2010 -0700" }, "message": "Merge \"Fix bug where home presses were not poking user activity.\" into gingerbread" }, { "commit": "ef3a8234824cc9f7c3464dd05f9aeca8ea77ebd9", "tree": "b1051454431d5071ac718dd12ee9c8f7a23be204", "parents": [ "2d512f5736fe96a14474cc2d86aa208563fccd49" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 18 13:21:23 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 18 14:50:13 2010 -0700" }, "message": "Fix bug where home presses were not poking user activity.\n\nWe now poke user activity twice: once upon dequeueing an event\nfor dispatch and then again just before we dispatch it. The second\npoke is to compensate for the fact that it can take a few seconds to\nidentify the dispatch target (if the application is responding slowly)\nbut we want to keep the display from going to sleep for X amount of time\nafter the app gets a chance to actually receive the event. This mirrors\npre-Gingerbread behavior.\n\nRemoved some unnecessary code that filters user activity pokes when sending\nevents to KeyGuard. We don\u0027t need this because KeyGuard already tells the\npower manager to disable user activity.\n\nBug: 3101397\nChange-Id: I8c3a77601fdef8f584e84cfdd11aa79da0ff51db\n" }, { "commit": "64cedc1abe79935a10b52f43b15213323ebf1a18", "tree": "019ca26084abbcccb357df956b5df2b574c4e8e2", "parents": [ "44dbe44464b5eacfb83f1d2be351c2b9a2f7170c", "92866ad00b01db67ea11828391c6aecb4232c2d8" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 18 14:23:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 14:23:14 2010 -0700" }, "message": "am 9f85ef4a: Merge \"DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView\" into gingerbread\n\nMerge commit \u00279f85ef4aebf510546355866b7cc458551ae3aa7f\u0027 into gingerbread-plus-aosp\n\n* commit \u00279f85ef4aebf510546355866b7cc458551ae3aa7f\u0027:\n DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView\n" }, { "commit": "92866ad00b01db67ea11828391c6aecb4232c2d8", "tree": "7b40e4ea2eb89758423bb5bf9f693adbe9d57d2c", "parents": [ "b9d9de2bdf103cdac0539d07d96cbef7a5a80872", "3e640596ebc1a5d1fb31ca1979f904d48dd58ee9" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 18 14:19:52 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 14:19:52 2010 -0700" }, "message": "Merge \"DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView\" into gingerbread" }, { "commit": "44dbe44464b5eacfb83f1d2be351c2b9a2f7170c", "tree": "019ca26084abbcccb357df956b5df2b574c4e8e2", "parents": [ "b7f0eeb2b0327e664a09ac67d3ef80498b7d4e95", "b9d9de2bdf103cdac0539d07d96cbef7a5a80872" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 14:19:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 14:19:09 2010 -0700" }, "message": "am ba2ec2b4: Merge \"Enable framework GPS and location manager logging\" into gingerbread\n\nMerge commit \u0027ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1\u0027:\n Enable framework GPS and location manager logging\n" }, { "commit": "b9d9de2bdf103cdac0539d07d96cbef7a5a80872", "tree": "7b40e4ea2eb89758423bb5bf9f693adbe9d57d2c", "parents": [ "661ef589b87cef2c6b9bc75b07af7d01f4c7a527", "8a1c39374ca30e3aa8af6a96b81f2bddb3fb6ba2" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 14:16:15 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 14:16:15 2010 -0700" }, "message": "Merge \"Enable framework GPS and location manager logging\" into gingerbread" } ], "next": "b7f0eeb2b0327e664a09ac67d3ef80498b7d4e95" }