)]}' { "log": [ { "commit": "85c5ca07b9c6e58337a149d36bc3cecbdb879046", "tree": "1c99b878e01f7ac291e197e7b3057e60f93a1001", "parents": [ "1b98a9e6a9bd22c4dca731491b701f7ece6a6eb7", "2f19f56ac5bcf02ed503bdaf95b724cba8ff782d" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 26 12:22:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 12:22:12 2010 -0700" }, "message": "am 2f19f56a: Merge \"Updade Surface (ANativeWindow) format based on its buffers format\" into gingerbread\n" }, { "commit": "1b98a9e6a9bd22c4dca731491b701f7ece6a6eb7", "tree": "5a2caac63fc46eadd8532660a682b51f35804963", "parents": [ "d9588e9c3cd5ffd6bcab28d41b6eda83a1d3d65a", "5219dd8e29d9248e89ef997c11f20d6a3dc0b3ee" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 26 12:19:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 12:19:48 2010 -0700" }, "message": "am 5219dd8e: Merge \"add format parameter to setBufferGeometry\" into gingerbread\n" }, { "commit": "d9588e9c3cd5ffd6bcab28d41b6eda83a1d3d65a", "tree": "fc331b85ca1fb928474327b0d058ba2f338b2439", "parents": [ "f56aac4b6e169dc6e57aec6e94709e2425f34459", "a7b745ca75136112f369f249fd06c2edafe0a6f6" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 26 12:19:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 12:19:43 2010 -0700" }, "message": "am a7b745ca: Merge \"fix eglChooseConfig() for special attributes.\" into gingerbread\n" }, { "commit": "2f19f56ac5bcf02ed503bdaf95b724cba8ff782d", "tree": "0413ca081d905859ec1b2010f6c5b05666eea2bc", "parents": [ "5219dd8e29d9248e89ef997c11f20d6a3dc0b3ee", "b9737a1d1b9eb24cab18a6f50659a43c8bca79be" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 26 12:18:32 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 26 12:18:32 2010 -0700" }, "message": "Merge \"Updade Surface (ANativeWindow) format based on its buffers format\" into gingerbread" }, { "commit": "5219dd8e29d9248e89ef997c11f20d6a3dc0b3ee", "tree": "197c39a27ed7d5429b6f76301a686cf39cc88113", "parents": [ "a7b745ca75136112f369f249fd06c2edafe0a6f6", "3026a1c4e88412b7fe997f93fedba871d79a03cd" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 26 12:18:19 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 26 12:18:19 2010 -0700" }, "message": "Merge \"add format parameter to setBufferGeometry\" into gingerbread" }, { "commit": "a7b745ca75136112f369f249fd06c2edafe0a6f6", "tree": "838379172d20c272b75bb9435ca568bd149deb12", "parents": [ "d8cf2125c10466078bed73efa1cdc34f48ff1729", "d8e350bc96c3f170d3016989b249174e65c1a661" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 26 12:18:07 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 26 12:18:07 2010 -0700" }, "message": "Merge \"fix eglChooseConfig() for special attributes.\" into gingerbread" }, { "commit": "f56aac4b6e169dc6e57aec6e94709e2425f34459", "tree": "893d071fa999ebba372b3f65b3eeaa77dffb3636", "parents": [ "a44a5e02d21505a9c891a31a34c83761600024c0", "d8cf2125c10466078bed73efa1cdc34f48ff1729" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Tue Oct 26 12:16:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 12:16:10 2010 -0700" }, "message": "am d8cf2125: Merge \"Add a way to get a string for an error code.\" into gingerbread\n" }, { "commit": "d8cf2125c10466078bed73efa1cdc34f48ff1729", "tree": "9e759d9929bdd4c187a4a8a1509dea230384f623", "parents": [ "1b6180ec317201e51cb4a773c59a825342fd2235", "68a5c9f3cf7292beec7ff4769b2005fed0438a7e" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Tue Oct 26 12:14:17 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 26 12:14:17 2010 -0700" }, "message": "Merge \"Add a way to get a string for an error code.\" into gingerbread" }, { "commit": "a44a5e02d21505a9c891a31a34c83761600024c0", "tree": "0cd858aa1b1ca5560f5c9ead9febc2c2fce88aa2", "parents": [ "cc8de576cd3aaf6c0b7d1515ffb74cb89e4764e3", "1b6180ec317201e51cb4a773c59a825342fd2235" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Oct 26 12:10:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 12:10:28 2010 -0700" }, "message": "am 1b6180ec: Merge \"Fix rendering of digitalClock/Gallery in Eclipse editors.\" into gingerbread\n" }, { "commit": "68a5c9f3cf7292beec7ff4769b2005fed0438a7e", "tree": "cf292113a81d57ede01c77cae7f3c766f00b3dd4", "parents": [ "5a147d083ca60c93d4f75509e820315521f9e4c0" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Tue Oct 26 14:09:48 2010 -0500" }, "committer": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Tue Oct 26 14:09:48 2010 -0500" }, "message": "Add a way to get a string for an error code.\n\nChange-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d\n" }, { "commit": "1b6180ec317201e51cb4a773c59a825342fd2235", "tree": "aea18ad05533887dea4a9b33a489dfcf9c8364ca", "parents": [ "5a147d083ca60c93d4f75509e820315521f9e4c0", "25e96ce7b99f9736a6024d25bd65a83774c7640f" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Oct 26 12:09:18 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 26 12:09:18 2010 -0700" }, "message": "Merge \"Fix rendering of digitalClock/Gallery in Eclipse editors.\" into gingerbread" }, { "commit": "25e96ce7b99f9736a6024d25bd65a83774c7640f", "tree": "2060eeb90d6cd266f526daa2f16bcfe33111a2a6", "parents": [ "106165b5102be226eb8049d2f7f62d7e26034e8a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Oct 26 11:18:39 2010 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Oct 26 11:18:39 2010 -0700" }, "message": "Fix rendering of digitalClock/Gallery in Eclipse editors.\n\nChange-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216\n" }, { "commit": "cc8de576cd3aaf6c0b7d1515ffb74cb89e4764e3", "tree": "20a79bf44ab6551de069489e2ab738955845b880", "parents": [ "1b571bd3e92a3e75b55ba5ed24e6e393d96ab948", "5a147d083ca60c93d4f75509e820315521f9e4c0" ], "author": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Tue Oct 26 09:11:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 09:11:12 2010 -0700" }, "message": "am 5a147d08: Merge \"DO NOT MERGE - Fixing capitalized ringtone metadata only\" into gingerbread\n" }, { "commit": "5a147d083ca60c93d4f75509e820315521f9e4c0", "tree": "2378316fdbe880cf8692275442db80288f1e1d14", "parents": [ "1d28a84059d4268978705abd343458da4b4e0752", "34952c012188c509fb64d156f4eb7966cd14a733" ], "author": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Tue Oct 26 09:09:22 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 26 09:09:22 2010 -0700" }, "message": "Merge \"DO NOT MERGE - Fixing capitalized ringtone metadata only\" into gingerbread" }, { "commit": "34952c012188c509fb64d156f4eb7966cd14a733", "tree": "1dbdd324bfefe19636e160e2080843e499562488", "parents": [ "11e2e9b0c261d95aafc9eb9c306f85fe95ac508a" ], "author": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Tue Oct 26 09:05:06 2010 -0700" }, "committer": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Tue Oct 26 09:05:06 2010 -0700" }, "message": "DO NOT MERGE - Fixing capitalized ringtone metadata only\n\nChange-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e\n" }, { "commit": "1b571bd3e92a3e75b55ba5ed24e6e393d96ab948", "tree": "ffaaeb3f53b3bf5a6111836ffd4375ca21887402", "parents": [ "ecae8a43b71a59ef2a4dcd2b3e5ffa248c37d53e", "1d28a84059d4268978705abd343458da4b4e0752" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Oct 26 08:36:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 08:36:24 2010 -0700" }, "message": "am 1d28a840: Merge \"Location Manager: Fix LocationManager.getBestProvider filtering.\" into gingerbread\n" }, { "commit": "1d28a84059d4268978705abd343458da4b4e0752", "tree": "cee070375b9130754749a084f7103b052f5b8ede", "parents": [ "1a58d9c398b7c584fed50f922a638f76bf0c94a0", "9e3191d16c025b44fb4a614b13e1c5b8488eb574" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Oct 26 08:34:32 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 26 08:34:32 2010 -0700" }, "message": "Merge \"Location Manager: Fix LocationManager.getBestProvider filtering.\" into gingerbread" }, { "commit": "ecae8a43b71a59ef2a4dcd2b3e5ffa248c37d53e", "tree": "9d78796a81d12944a808f4889a6202174ca37714", "parents": [ "6a49bff5694439b3f892cfcfd90b814884f8d44f", "1a58d9c398b7c584fed50f922a638f76bf0c94a0" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 26 08:14:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 08:14:48 2010 -0700" }, "message": "am 1a58d9c3: Merge \"Partial fix for issue 3124895.\" into gingerbread\n" }, { "commit": "1a58d9c398b7c584fed50f922a638f76bf0c94a0", "tree": "b82df60560e88bb18252bd046ecd37b071523ac9", "parents": [ "79fb6449a10d37837702c695a53eeec7d428c240", "164a8f86c7e48992691368c4895709c3bdb835a4" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 26 08:13:32 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 26 08:13:32 2010 -0700" }, "message": "Merge \"Partial fix for issue 3124895.\" into gingerbread" }, { "commit": "6a49bff5694439b3f892cfcfd90b814884f8d44f", "tree": "bc09c27576d4bd632910144d300d4fa312c6211c", "parents": [ "a1e7474498163f8ddbe1146f8f375fbf905db41d", "79fb6449a10d37837702c695a53eeec7d428c240" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Tue Oct 26 07:24:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 07:24:57 2010 -0700" }, "message": "am 79fb6449: Merge \"Make some contructors public but hidden.\" into gingerbread\n" }, { "commit": "a1e7474498163f8ddbe1146f8f375fbf905db41d", "tree": "53e566e97754ed9be275c704c4568582ae1762b3", "parents": [ "55744530222288c79a5e1aa61b65f7f6b2262fab", "11e2e9b0c261d95aafc9eb9c306f85fe95ac508a" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Oct 26 07:24:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 07:24:41 2010 -0700" }, "message": "am 11e2e9b0: Merge \"Don\\\u0027t turn the button backlights on if the screen is off. Part 2.\" into gingerbread\n" }, { "commit": "79fb6449a10d37837702c695a53eeec7d428c240", "tree": "db551db915eec32d722cf00111df7708dae039c3", "parents": [ "11e2e9b0c261d95aafc9eb9c306f85fe95ac508a", "d6c052a8ec5a874289567a637bf7411bd24f9e05" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Tue Oct 26 07:16:46 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 26 07:16:47 2010 -0700" }, "message": "Merge \"Make some contructors public but hidden.\" into gingerbread" }, { "commit": "9e3191d16c025b44fb4a614b13e1c5b8488eb574", "tree": "49c91123fe9683b15579060d211e2bb1425041a7", "parents": [ "11e2e9b0c261d95aafc9eb9c306f85fe95ac508a" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Oct 26 10:01:55 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Oct 26 10:01:55 2010 -0400" }, "message": "Location Manager: Fix LocationManager.getBestProvider filtering.\n\ngetBestProvider should only return location providers that the client\nhas permission to use.\n\nBUG: 3124614\n\nChange-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "d6c052a8ec5a874289567a637bf7411bd24f9e05", "tree": "1ec2634e74de2d933d4059d932890c71fd72ee53", "parents": [ "044df235c86ac69bb0e56cb4387e111ec276276e" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Tue Oct 26 08:59:18 2010 -0500" }, "committer": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Tue Oct 26 08:59:18 2010 -0500" }, "message": "Make some contructors public but hidden.\n\nThis allows them to be used from within the\nNFC stack process internally.\n\nChange-Id: I7f81759da63d451efe86550a57a400fb224b2064\n" }, { "commit": "164a8f86c7e48992691368c4895709c3bdb835a4", "tree": "7cf2df63ba49be13fe25f80a1662f6b8a3782d24", "parents": [ "79e76f52a6235c01aec64a978e33b89cbb9e1c2e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Oct 25 19:42:08 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Oct 25 19:45:39 2010 -0700" }, "message": "Partial fix for issue 3124895.\n\nWhen a SIP call is put on hold and no other call is active, the audio mode should not be\nswitched to incall.\n\nChange-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af\n" }, { "commit": "11e2e9b0c261d95aafc9eb9c306f85fe95ac508a", "tree": "edbbde9a2e7144864133a14be30523ce2993c014", "parents": [ "3d40cd5055a8b507877e10bfb81b3ae35a2602a4", "06eb33acb77b13f3dd55f11e3c1dfbc39f9c586b" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Mon Oct 25 18:48:08 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 18:48:08 2010 -0700" }, "message": "Merge \"Don\u0027t turn the button backlights on if the screen is off. Part 2.\" into gingerbread" }, { "commit": "55744530222288c79a5e1aa61b65f7f6b2262fab", "tree": "d06ae88f8c090791da3d63002642543d1d4af289", "parents": [ "f0b3fa60dba67e904a2336980ecbb937d32b2387", "66a5d695ed9268869ca50e304bfeabd2a021c6cd" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Oct 25 17:28:29 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 17:28:29 2010 -0700" }, "message": "Merge \"resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp\" into gingerbread-plus-aosp" }, { "commit": "66a5d695ed9268869ca50e304bfeabd2a021c6cd", "tree": "1f8f0af3560c3408c4565499e8230ceda05cf758", "parents": [ "41d21efd61157c9a4c49b2f7a6580ae0cbb58397", "b4ae2f1ba419212224d53db81c46ad242bebd17b" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Oct 25 17:27:16 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Oct 25 17:27:16 2010 -0700" }, "message": "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp\n\nChange-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8\n" }, { "commit": "f0b3fa60dba67e904a2336980ecbb937d32b2387", "tree": "0dc0cb968ddeefaa33c18c466cb6264706c0695d", "parents": [ "41d21efd61157c9a4c49b2f7a6580ae0cbb58397", "3d40cd5055a8b507877e10bfb81b3ae35a2602a4" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 25 17:23:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 17:23:10 2010 -0700" }, "message": "am 3d40cd50: am c9ac1079: update featured videos also remove \"new\" tags from SDK and Resources nav items\n\nMerge commit \u00273d40cd5055a8b507877e10bfb81b3ae35a2602a4\u0027 into gingerbread-plus-aosp\n\n* commit \u00273d40cd5055a8b507877e10bfb81b3ae35a2602a4\u0027:\n update featured videos\n" }, { "commit": "3d40cd5055a8b507877e10bfb81b3ae35a2602a4", "tree": "6e50d6e877ab945dcd3d6e7f5caf74f951e27909", "parents": [ "044df235c86ac69bb0e56cb4387e111ec276276e", "c9ac1079696b93a294f504c6561397ef731a46f9" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 25 17:15:50 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 17:15:50 2010 -0700" }, "message": "am c9ac1079: update featured videos also remove \"new\" tags from SDK and Resources nav items\n\nMerge commit \u0027c9ac1079696b93a294f504c6561397ef731a46f9\u0027 into gingerbread\n\n* commit \u0027c9ac1079696b93a294f504c6561397ef731a46f9\u0027:\n update featured videos\n" }, { "commit": "b9737a1d1b9eb24cab18a6f50659a43c8bca79be", "tree": "e2852ec578389d66a4ad592c109a7697c8306924", "parents": [ "3026a1c4e88412b7fe997f93fedba871d79a03cd" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 25 16:29:24 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 25 17:08:37 2010 -0700" }, "message": "Updade Surface (ANativeWindow) format based on its buffers format\n\nthis is to allow applications to change the format of a surface\u0027s\nbuffer, and have it reflected in EGL; which is needed for\nEGLConfig validation.\n\nChange-Id: Iee074c30ad765881e2409c1d37450b05e561c44d\n" }, { "commit": "41d21efd61157c9a4c49b2f7a6580ae0cbb58397", "tree": "9be36ca919b6cd31e06c8e161b962dda27264d13", "parents": [ "965f960ecacfa7528854d8371ecf309b46fc6ebb", "044df235c86ac69bb0e56cb4387e111ec276276e" ], "author": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Mon Oct 25 16:50:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 16:50:34 2010 -0700" }, "message": "am 044df235: Merge \"DO NOT MERGE - Updated ringtone assets for crespo\" into gingerbread\n\nMerge commit \u0027044df235c86ac69bb0e56cb4387e111ec276276e\u0027 into gingerbread-plus-aosp\n\n* commit \u0027044df235c86ac69bb0e56cb4387e111ec276276e\u0027:\n DO NOT MERGE - Updated ringtone assets for crespo\n" }, { "commit": "044df235c86ac69bb0e56cb4387e111ec276276e", "tree": "4c75a7c605331ffb4a8c25d5f951e052945503ad", "parents": [ "5016df1cface59b04ad59d0fef29ea32dcad8d60", "6a83d37769b1c65addb9aaff3ca7ebd42aedc1cf" ], "author": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Mon Oct 25 16:44:01 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 16:44:01 2010 -0700" }, "message": "Merge \"DO NOT MERGE - Updated ringtone assets for crespo\" into gingerbread" }, { "commit": "965f960ecacfa7528854d8371ecf309b46fc6ebb", "tree": "f7594020d98e622980fc1cff4937b869ecffda56", "parents": [ "96bdc500104c3e162495a9bfcf90799467e45c3d", "b8791479af814d530a3810d0516ef5628958a8d0" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 16:39:11 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 16:39:12 2010 -0700" }, "message": "Merge \"resolved conflicts for merge of 9084631d to gingerbread-plus-aosp\" into gingerbread-plus-aosp" }, { "commit": "6a83d37769b1c65addb9aaff3ca7ebd42aedc1cf", "tree": "03ba549756a2d2be67a67886f4dae74b921a9fd7", "parents": [ "60607a9012c9b7d39bef8fcf0284772f1b061efc" ], "author": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Mon Oct 25 16:38:41 2010 -0700" }, "committer": { "name": "Justin Ho", "email": "justinho@google.com", "time": "Mon Oct 25 16:38:41 2010 -0700" }, "message": "DO NOT MERGE - Updated ringtone assets for crespo\n\nChange-Id: Ie5c6b0bfa282f976129f5e87a09512da01e6851b\n" }, { "commit": "96bdc500104c3e162495a9bfcf90799467e45c3d", "tree": "d82b196b06dd6943d6e15ff6b8e9e5cb5be66349", "parents": [ "b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b", "5016df1cface59b04ad59d0fef29ea32dcad8d60" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 25 16:22:46 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 16:22:46 2010 -0700" }, "message": "am 5016df1c: Merge \"Doc Change: Revert NotePad sample test package\" into gingerbread\n\nMerge commit \u00275016df1cface59b04ad59d0fef29ea32dcad8d60\u0027 into gingerbread-plus-aosp\n\n* commit \u00275016df1cface59b04ad59d0fef29ea32dcad8d60\u0027:\n Doc Change: Revert NotePad sample test package\n" }, { "commit": "b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b", "tree": "ae76a80341816647bc8a6c401ee60145b01e0be3", "parents": [ "fecc5f066d7aa84ce3474912f1137a10bd77bb8e", "3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Mon Oct 25 16:19:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 16:19:42 2010 -0700" }, "message": "am 3d1ce9ec: Merge \"Import revised translations. DO NOT MERGE\" into gingerbread\n\nMerge commit \u00273d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b\u0027 into gingerbread-plus-aosp\n\n* commit \u00273d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b\u0027:\n Import revised translations. DO NOT MERGE\n" }, { "commit": "5016df1cface59b04ad59d0fef29ea32dcad8d60", "tree": "0f6b1837b68ecda9e093bfe6df4bae82ffcf4e62", "parents": [ "3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b", "24fed74a34bb0b4dc35d0a86c2b99991fa86c848" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 25 16:19:18 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 16:19:18 2010 -0700" }, "message": "Merge \"Doc Change: Revert NotePad sample test package\" into gingerbread" }, { "commit": "3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b", "tree": "a8e6554b6e7be4bd3c369ac2be8d0fdf9e291ed6", "parents": [ "106165b5102be226eb8049d2f7f62d7e26034e8a", "082082121317480574dbb7fd2a26717b2488cba5" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Mon Oct 25 16:14:47 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 16:14:47 2010 -0700" }, "message": "Merge \"Import revised translations. DO NOT MERGE\" into gingerbread" }, { "commit": "b8791479af814d530a3810d0516ef5628958a8d0", "tree": "512aa5507bf60631597c06e77ff58a2e2d99b76b", "parents": [ "67bb6741965c0b9f3bf6b4caf2647efc564e287e", "9084631dba8938942ddd8d4cb1e0f9149965ae8e" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 15:23:04 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 16:11:18 2010 -0700" }, "message": "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp\n\nChange-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472\n" }, { "commit": "3026a1c4e88412b7fe997f93fedba871d79a03cd", "tree": "f8eb7c4b680c14bc6bfdd082e15420dfa0c7e779", "parents": [ "457bed2bc6561dd67429dde238453fee8602fa9b" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Sun Oct 24 18:35:26 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 25 15:58:35 2010 -0700" }, "message": "add format parameter to setBufferGeometry\n\nChange-Id: I7cc2acdc6e65e9468ecfd5b2f22e6b495a383be9\n" }, { "commit": "24fed74a34bb0b4dc35d0a86c2b99991fa86c848", "tree": "093edefbd0f16f5982ee0ddcb2bfe3770d5f8c01", "parents": [ "106165b5102be226eb8049d2f7f62d7e26034e8a" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 25 15:55:13 2010 -0700" }, "committer": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Mon Oct 25 15:55:13 2010 -0700" }, "message": "Doc Change: Revert NotePad sample test package\n\nChange-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37\n" }, { "commit": "d8e350bc96c3f170d3016989b249174e65c1a661", "tree": "3373c8d89e8db995e516fdbd13f49480655827b6", "parents": [ "457bed2bc6561dd67429dde238453fee8602fa9b" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 25 15:51:24 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 25 15:51:24 2010 -0700" }, "message": "fix eglChooseConfig() for special attributes.\n\naffects software renderer (emu) only.\n\nper EGL spec:\n If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT,\n EGL_MAX_PBUFFER_PIXELS, or EGL_NATIVE_VISUAL_ID are speciļ¬ed\n in attrib list, then they are ignored\n\nChange-Id: I3d5214ce896986da2f11d2eb1889afc41731eaa6\n" }, { "commit": "c9ac1079696b93a294f504c6561397ef731a46f9", "tree": "fac5ac15825fbcdbfada9102c931fa842989c2cc", "parents": [ "a6df4b1bfdb8de7de9b52bee4d01c65941f2d722" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 25 13:45:35 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 25 15:42:03 2010 -0700" }, "message": "update featured videos\nalso remove \"new\" tags from SDK and Resources nav items\n\nChange-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5\n" }, { "commit": "082082121317480574dbb7fd2a26717b2488cba5", "tree": "19f6c2cf117e54d1aa5120f7fec338d32d60ca71", "parents": [ "79e76f52a6235c01aec64a978e33b89cbb9e1c2e" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Mon Oct 25 15:41:31 2010 -0700" }, "committer": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Mon Oct 25 15:41:31 2010 -0700" }, "message": "Import revised translations. DO NOT MERGE\n\nChange-Id: I404fe29521193ca9d0a3689d4a786253dc27e2d6\n" }, { "commit": "b4ae2f1ba419212224d53db81c46ad242bebd17b", "tree": "ddc003daed36cc0fa0e0b3c92061999b5c64f5bb", "parents": [ "9084631dba8938942ddd8d4cb1e0f9149965ae8e", "d6499dc69fd54d3ec735e267410f832c302acc97" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Oct 25 15:32:12 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Mon Oct 25 15:32:12 2010 -0700" }, "message": "Merge \"frameworks/base: Handle null from topRunningNonDelayedActivityLocked\"" }, { "commit": "fecc5f066d7aa84ce3474912f1137a10bd77bb8e", "tree": "0923b3f5cd996c05eff4152ec16a4cf187934d49", "parents": [ "6c8d8d8927373fdb9ad1c853396b5dbc8295f996", "106165b5102be226eb8049d2f7f62d7e26034e8a" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Mon Oct 25 14:49:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 14:49:07 2010 -0700" }, "message": "am 106165b5: Merge \"Add a RHS status bar slot for NFC.\" into gingerbread\n\nMerge commit \u0027106165b5102be226eb8049d2f7f62d7e26034e8a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027106165b5102be226eb8049d2f7f62d7e26034e8a\u0027:\n Add a RHS status bar slot for NFC.\n" }, { "commit": "106165b5102be226eb8049d2f7f62d7e26034e8a", "tree": "421216e6673a7856f81ae887c6fc7942391f7299", "parents": [ "8c32bddfac259543f4ed87341fce42bc5ed60506", "e0be933ec7c05826683e61665644bf106f081f34" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Mon Oct 25 14:46:45 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 14:46:45 2010 -0700" }, "message": "Merge \"Add a RHS status bar slot for NFC.\" into gingerbread" }, { "commit": "e0be933ec7c05826683e61665644bf106f081f34", "tree": "6c83fa2b2f3ca4ef6ba55a2d884def13c3cae187", "parents": [ "17efcde161cbcbc0d98bf809036c5e640497f001" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Mon Oct 25 16:41:41 2010 -0500" }, "committer": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Mon Oct 25 16:41:41 2010 -0500" }, "message": "Add a RHS status bar slot for NFC.\n\nChange-Id: I62cbcec051a2c69f76fb9a5b9ff6f6bc05a8257b\n" }, { "commit": "06eb33acb77b13f3dd55f11e3c1dfbc39f9c586b", "tree": "ed71fde4e62d5138429b5027cba672baa225f4c9", "parents": [ "8c32bddfac259543f4ed87341fce42bc5ed60506" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Mon Oct 25 14:09:21 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Mon Oct 25 14:21:06 2010 -0700" }, "message": "Don\u0027t turn the button backlights on if the screen is off. Part 2.\n\nThese are the logs from when I just reproduced it here. This means that we got an event after the\nscreen turned off. So isScreenTurningOffLocked() is working, but we need to also check that we\u0027re\nnot off. This bug is happening because lightSensorChangedLocked is calling\nmButtonLight.setBrightness() directly instead of going through updateLightsLocked, which is where\nI added that check to not turn the buttons on of the screen is off.\n\nD/PowerManagerService( 1243): onSensorChanged: light value: 1280\nI/power ( 1243): *** set_screen_state 0\nD/PowerManagerService( 1243): enableLightSensor false\nD/PowerManagerService( 1243): onSensorChanged: light value: 320\nD/PowerManagerService( 1243): lightSensorChangedLocked 320\nD/PowerManagerService( 1243): lcdValue 55\nD/PowerManagerService( 1243): buttonValue 255\nD/PowerManagerService( 1243): keyboardValue 0\nD/SurfaceFlinger( 1243): About to give-up screen, flinger \u003d 0x8dcf! 0\n\nBug: 3117801\nChange-Id: I722d66cafba71b183cc987b7383d4ad7e171ba82\n" }, { "commit": "6c8d8d8927373fdb9ad1c853396b5dbc8295f996", "tree": "892e9f71d37217e2c7e66041d258d19905eb3ad2", "parents": [ "e1ca532d72cbfacdce794f8bb4d439e609ec9871", "8c32bddfac259543f4ed87341fce42bc5ed60506" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Oct 25 13:55:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 13:55:27 2010 -0700" }, "message": "am 8c32bddf: Merge \"GPS: Disable verbose logging\" into gingerbread\n\nMerge commit \u00278c32bddfac259543f4ed87341fce42bc5ed60506\u0027 into gingerbread-plus-aosp\n\n* commit \u00278c32bddfac259543f4ed87341fce42bc5ed60506\u0027:\n GPS: Disable verbose logging\n" }, { "commit": "8c32bddfac259543f4ed87341fce42bc5ed60506", "tree": "033b51eda76fb75f7f367b51957721ef6a0f94c0", "parents": [ "457bed2bc6561dd67429dde238453fee8602fa9b", "4a7b65e0d544ef1feff8e1e5789f469f89ebb85c" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Oct 25 13:49:13 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 13:49:13 2010 -0700" }, "message": "Merge \"GPS: Disable verbose logging\" into gingerbread" }, { "commit": "e1ca532d72cbfacdce794f8bb4d439e609ec9871", "tree": "bec56dd52b65c46d7a28dcbfeb8955412b0d80a5", "parents": [ "b4645353090f1bdd5cc1d4ab98feac7ccf966368", "457bed2bc6561dd67429dde238453fee8602fa9b" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 25 13:38:15 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 13:38:15 2010 -0700" }, "message": "am 457bed2b: Merge \"fix [3123221] Video sticks playing back upside down following orientation switch\" into gingerbread\n\nMerge commit \u0027457bed2bc6561dd67429dde238453fee8602fa9b\u0027 into gingerbread-plus-aosp\n\n* commit \u0027457bed2bc6561dd67429dde238453fee8602fa9b\u0027:\n fix [3123221] Video sticks playing back upside down following orientation switch\n" }, { "commit": "b4645353090f1bdd5cc1d4ab98feac7ccf966368", "tree": "0b4350d1375b57b5a2b1df9e816ed61252851e21", "parents": [ "67bb6741965c0b9f3bf6b4caf2647efc564e287e", "ce4d36ad729f83253d4c5ec9906148f45cc00f8e" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 25 13:38:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 13:38:11 2010 -0700" }, "message": "am ce4d36ad: Merge \"fix [3118445] Transform * Transform does not work as expected\" into gingerbread\n\nMerge commit \u0027ce4d36ad729f83253d4c5ec9906148f45cc00f8e\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ce4d36ad729f83253d4c5ec9906148f45cc00f8e\u0027:\n fix [3118445] Transform * Transform does not work as expected\n" }, { "commit": "4a7b65e0d544ef1feff8e1e5789f469f89ebb85c", "tree": "3816ce50b2d10d62f5ce3f90f34b3be9f3138226", "parents": [ "236568999411214ef440cabc6d12e3bf5f19d8f4" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Oct 25 16:35:55 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Oct 25 16:35:55 2010 -0400" }, "message": "GPS: Disable verbose logging\n\nBUG: 3127049\n\nChange-Id: I9efd9eb7ff69724b133f3b70c52e173f49ddfbc5\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "457bed2bc6561dd67429dde238453fee8602fa9b", "tree": "2bb0cae9bc23a4ae65ea461559d5cd2239b74b03", "parents": [ "ce4d36ad729f83253d4c5ec9906148f45cc00f8e", "c57b15c9c8dfb31e3c1ffcadd0e1522bf76dedd2" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 25 13:31:11 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 13:31:11 2010 -0700" }, "message": "Merge \"fix [3123221] Video sticks playing back upside down following orientation switch\" into gingerbread" }, { "commit": "ce4d36ad729f83253d4c5ec9906148f45cc00f8e", "tree": "7a1cc02ff4216e4f00b3b0aba2d64d51a5b1b299", "parents": [ "17efcde161cbcbc0d98bf809036c5e640497f001", "546c21dbfa26939081e903ea346fcb581bddbeb4" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 25 13:31:03 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 13:31:03 2010 -0700" }, "message": "Merge \"fix [3118445] Transform * Transform does not work as expected\" into gingerbread" }, { "commit": "9084631dba8938942ddd8d4cb1e0f9149965ae8e", "tree": "0ba25dd389bab286b27c178e9598cea45cd1cbe6", "parents": [ "c5371fadf2753d074ef117685fed05b0140d6864", "d5770917a50a828cb4337c2a392b3e4a375624b9" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 12:23:35 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Mon Oct 25 12:23:35 2010 -0700" }, "message": "Merge \"DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback\"" }, { "commit": "d5770917a50a828cb4337c2a392b3e4a375624b9", "tree": "0ba25dd389bab286b27c178e9598cea45cd1cbe6", "parents": [ "c5371fadf2753d074ef117685fed05b0140d6864" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jun 22 13:55:38 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 12:16:56 2010 -0700" }, "message": "DRM framework support:\n- add a sniffer for DRM files\n- add DRMSource and DRMExtractor for es_based DRM\n- add pread in FileSource.cpp for container_based DRM\n- add native DRM framework API calls in the player for\n DRM audio/video playback\n\nChange-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f\n" }, { "commit": "67bb6741965c0b9f3bf6b4caf2647efc564e287e", "tree": "88f8aa5a73fd9cc07b26dfb638019dea31014a97", "parents": [ "177b05d6140cb0fb25fa75a61b888cf53f44564e", "17efcde161cbcbc0d98bf809036c5e640497f001" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 25 12:07:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 12:07:51 2010 -0700" }, "message": "am 17efcde1: Merge \"DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest\" into gingerbread\n\nMerge commit \u002717efcde161cbcbc0d98bf809036c5e640497f001\u0027 into gingerbread-plus-aosp\n\n* commit \u002717efcde161cbcbc0d98bf809036c5e640497f001\u0027:\n DO NOT MERGE Fix bug 3124899 - timeout in CTS test\n" }, { "commit": "17efcde161cbcbc0d98bf809036c5e640497f001", "tree": "d40027c6da174cc2a3b546f94833857e9b4f7a3b", "parents": [ "abb50f152879cc8dff1bf5cbc4d6375e959305cd", "b9b8f7b99b25eb9520e5d33e5a84d202d96e81af" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 25 11:43:03 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 11:43:03 2010 -0700" }, "message": "Merge \"DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest\" into gingerbread" }, { "commit": "177b05d6140cb0fb25fa75a61b888cf53f44564e", "tree": "0e4fda93c5d2df0fa81c9952a104e259a2fe47b2", "parents": [ "4c8fda62e1bf21318d22f4b85aaa1c729da976cf", "abb50f152879cc8dff1bf5cbc4d6375e959305cd" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 25 11:27:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 11:27:55 2010 -0700" }, "message": "am abb50f15: Merge \"docs: fix a couple api links\" into gingerbread\n\nMerge commit \u0027abb50f152879cc8dff1bf5cbc4d6375e959305cd\u0027 into gingerbread-plus-aosp\n\n* commit \u0027abb50f152879cc8dff1bf5cbc4d6375e959305cd\u0027:\n docs: fix a couple api links\n" }, { "commit": "abb50f152879cc8dff1bf5cbc4d6375e959305cd", "tree": "efd31b471d8c22f4c1d541f17c4dd0edfc96255a", "parents": [ "79e76f52a6235c01aec64a978e33b89cbb9e1c2e", "4b5da6829aa5e324f5e9414c25d132ba0a9ebeb3" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Oct 25 11:18:28 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 11:18:28 2010 -0700" }, "message": "Merge \"docs: fix a couple api links\" into gingerbread" }, { "commit": "b9b8f7b99b25eb9520e5d33e5a84d202d96e81af", "tree": "2e0d8ef2db59fb6943f3fad6047be5c43956125b", "parents": [ "79e76f52a6235c01aec64a978e33b89cbb9e1c2e" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 25 11:08:06 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 25 11:12:41 2010 -0700" }, "message": "DO NOT MERGE Fix bug 3124899 - timeout in CTS test\nExpandableListViewBasicTest\n\nA certain sequence of events could cause AbsListView to enter an\ninfinite event loop. Only report reaching a scroll boundary to the\noverscroll code path if the Scroller wants to move further, not if\nwe\u0027re done moving.\n\nChange-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40\n" }, { "commit": "4c8fda62e1bf21318d22f4b85aaa1c729da976cf", "tree": "93138f56a06ea2c08fe2d2b212247297343d50fd", "parents": [ "b877a54a27d5f8a4ccbde9ae548f8c416e4317e5", "79e76f52a6235c01aec64a978e33b89cbb9e1c2e" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 25 09:09:37 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 09:09:37 2010 -0700" }, "message": "am 79e76f52: Merge \"Fixed NdefTag parcelable conversion methods.\" into gingerbread\n\nMerge commit \u002779e76f52a6235c01aec64a978e33b89cbb9e1c2e\u0027 into gingerbread-plus-aosp\n\n* commit \u002779e76f52a6235c01aec64a978e33b89cbb9e1c2e\u0027:\n Fixed NdefTag parcelable conversion methods.\n" }, { "commit": "b877a54a27d5f8a4ccbde9ae548f8c416e4317e5", "tree": "9e270807e4baec0ad4129964c6e13e01ce5a69e3", "parents": [ "d6abaf326ba4e0ff342cf28a828b75a334beba69", "89821204379816f6bee6902c4f132c014700c3b0" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Mon Oct 25 09:09:26 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 09:09:26 2010 -0700" }, "message": "am 89821204: Merge \"Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge\" into gingerbread\n\nMerge commit \u002789821204379816f6bee6902c4f132c014700c3b0\u0027 into gingerbread-plus-aosp\n\n* commit \u002789821204379816f6bee6902c4f132c014700c3b0\u0027:\n Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge\n" }, { "commit": "79e76f52a6235c01aec64a978e33b89cbb9e1c2e", "tree": "a92e62eb122decc720a5508fcef46a42a827ad5e", "parents": [ "89821204379816f6bee6902c4f132c014700c3b0", "e2e4ea9ea8f5724403e6267d193a740dc7c78785" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 25 08:58:00 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 08:58:00 2010 -0700" }, "message": "Merge \"Fixed NdefTag parcelable conversion methods.\" into gingerbread" }, { "commit": "89821204379816f6bee6902c4f132c014700c3b0", "tree": "e0b0bea32796d9a0819b9f66300d100fd94277a1", "parents": [ "145550a00ea59ff20133acc95315e463628e16db", "994c02bbfeba1dde5ef2761900a433933ac183f8" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Mon Oct 25 08:55:54 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 25 08:55:54 2010 -0700" }, "message": "Merge \"Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge\" into gingerbread" }, { "commit": "e2e4ea9ea8f5724403e6267d193a740dc7c78785", "tree": "9bc539d6fafa52b06ab76760ef0d9f18582a4d15", "parents": [ "145550a00ea59ff20133acc95315e463628e16db" ], "author": { "name": "Sylvain Fonteneau", "email": "sylvain.fonteneau@trusted-logic.com", "time": "Mon Oct 25 07:28:03 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 25 08:55:36 2010 -0700" }, "message": "Fixed NdefTag parcelable conversion methods.\n\nAlso removed call to obsolete openTagConnection() method which was crashing.\n\nChange-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "994c02bbfeba1dde5ef2761900a433933ac183f8", "tree": "75fe725a1f6257ac20d266831e8d27d77cd8a945", "parents": [ "b6a2256e5461160a89d077b761d3253d95ce869f" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Thu Oct 21 12:50:37 2010 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Mon Oct 25 14:56:22 2010 +0800" }, "message": "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge\n\nNow overlay does flip before rotation.\nbug:3114236\nChange-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb\n" }, { "commit": "d6abaf326ba4e0ff342cf28a828b75a334beba69", "tree": "4ab689cdd5388445b67f235a65316b4583e5bc3e", "parents": [ "c2f78020d3887539fc90230d96465e4b1dc84d8e", "145550a00ea59ff20133acc95315e463628e16db" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Sun Oct 24 22:11:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 24 22:11:52 2010 -0700" }, "message": "am 145550a0: Merge \"Document getPollBytes() and getActivationBytes().\" into gingerbread\n\nMerge commit \u0027145550a00ea59ff20133acc95315e463628e16db\u0027 into gingerbread-plus-aosp\n\n* commit \u0027145550a00ea59ff20133acc95315e463628e16db\u0027:\n Document getPollBytes() and getActivationBytes().\n" }, { "commit": "145550a00ea59ff20133acc95315e463628e16db", "tree": "31ac424d4ab8f6621c448cc5eeb29bb4da71a99e", "parents": [ "236568999411214ef440cabc6d12e3bf5f19d8f4", "416d72f4b6e68439828b9c189bd10cc0004f0f88" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Sun Oct 24 22:06:15 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Oct 24 22:06:15 2010 -0700" }, "message": "Merge \"Document getPollBytes() and getActivationBytes().\" into gingerbread" }, { "commit": "416d72f4b6e68439828b9c189bd10cc0004f0f88", "tree": "e03bd9579e27a5ef31592330f6364fe72f73f52b", "parents": [ "07f3bee2db8b6e93ebbf7222676bd9f468e85569" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Sun Oct 24 22:03:04 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Sun Oct 24 22:03:04 2010 -0700" }, "message": "Document getPollBytes() and getActivationBytes().\n\nNo code change.\n\nChange-Id: Ideb427b2684b9f9296abefb7c97eabc52db73ee0\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "c57b15c9c8dfb31e3c1ffcadd0e1522bf76dedd2", "tree": "71110f1876f58a9da6c3f52cb5b2107101434527", "parents": [ "860c2df4132a2a0be9bcb0e91bfb7e79588c000f" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Sun Oct 24 19:03:58 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Sun Oct 24 19:03:58 2010 -0700" }, "message": "fix [3123221] Video sticks playing back upside down following orientation switch\n\nthe overlay wasn\u0027t reconfigured when the screen-orientation changed. It was\nonly done when a parameter of the surface itself changed.\n\nChange-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c\n" }, { "commit": "c2f78020d3887539fc90230d96465e4b1dc84d8e", "tree": "c71f7293dfae5566b7ad688ddf33a676753c35ef", "parents": [ "2ef36763700eff5679d6012e7f078c57f1a4c465", "236568999411214ef440cabc6d12e3bf5f19d8f4" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Oct 24 18:38:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 24 18:38:11 2010 -0700" }, "message": "am 23656899: Merge \"Fix issue #3126018: No way to specify NativeActivity\\\u0027s native method\" into gingerbread\n\nMerge commit \u0027236568999411214ef440cabc6d12e3bf5f19d8f4\u0027 into gingerbread-plus-aosp\n\n* commit \u0027236568999411214ef440cabc6d12e3bf5f19d8f4\u0027:\n Fix issue #3126018: No way to specify NativeActivity\u0027s native method\n" }, { "commit": "236568999411214ef440cabc6d12e3bf5f19d8f4", "tree": "bd7f442be4bc3b6ebbdd7c5ca0dbadc081033a8c", "parents": [ "860c2df4132a2a0be9bcb0e91bfb7e79588c000f", "e21d91c694e828e6285cc50e79b2a6be6e8c692b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Oct 24 18:33:36 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Oct 24 18:33:36 2010 -0700" }, "message": "Merge \"Fix issue #3126018: No way to specify NativeActivity\u0027s native method\" into gingerbread" }, { "commit": "e21d91c694e828e6285cc50e79b2a6be6e8c692b", "tree": "bff7d5088aa8dc568c33a1c68a7dbd976ebe0f58", "parents": [ "b6a2256e5461160a89d077b761d3253d95ce869f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Oct 24 14:56:38 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Oct 24 14:56:38 2010 -0700" }, "message": "Fix issue #3126018: No way to specify NativeActivity\u0027s native method\n\nChange-Id: I59de6a543e7f7f45d963a905829a3f56f32bf8cf\n" }, { "commit": "546c21dbfa26939081e903ea346fcb581bddbeb4", "tree": "603d085fe40919315d3688602e7cafaee2fff276", "parents": [ "60607a9012c9b7d39bef8fcf0284772f1b061efc" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Sun Oct 24 14:53:05 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Sun Oct 24 14:53:05 2010 -0700" }, "message": "fix [3118445] Transform * Transform does not work as expected\n\nThe problem wasn\u0027t in the multiply operator, but rather in the code\nthat built the transform from the HAL bitmask.\n\nWe now use the multiply operator to build the Transform from the bitmask,\nwhich guarantees, it\u0027ll always be correct.\n\nAlso added a simple test for Transform.\n\nChange-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227\n" }, { "commit": "2ef36763700eff5679d6012e7f078c57f1a4c465", "tree": "3b36010de56350d0b88914c4fbd729afa38acd00", "parents": [ "b34fe2f0258eb1ed512b682206b7fe65116f1dbd", "860c2df4132a2a0be9bcb0e91bfb7e79588c000f" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Oct 24 14:31:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 24 14:31:41 2010 -0700" }, "message": "am 860c2df4: Merge \"Add unit tests for native input and fix bugs identified.\" into gingerbread\n\nMerge commit \u0027860c2df4132a2a0be9bcb0e91bfb7e79588c000f\u0027 into gingerbread-plus-aosp\n\n* commit \u0027860c2df4132a2a0be9bcb0e91bfb7e79588c000f\u0027:\n Add unit tests for native input and fix bugs identified.\n" }, { "commit": "860c2df4132a2a0be9bcb0e91bfb7e79588c000f", "tree": "f26922bf40ab8be62f40917d41f9d789ec270c48", "parents": [ "60607a9012c9b7d39bef8fcf0284772f1b061efc", "c3db858de9fa152480b9cf53c8c0cb793a280722" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Oct 24 14:18:19 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Oct 24 14:18:19 2010 -0700" }, "message": "Merge \"Add unit tests for native input and fix bugs identified.\" into gingerbread" }, { "commit": "b34fe2f0258eb1ed512b682206b7fe65116f1dbd", "tree": "6563e33b15f942be000c23e04347dd0ba36f0572", "parents": [ "b04e3940d190458ae46e2aa10667a667398cd87a", "60607a9012c9b7d39bef8fcf0284772f1b061efc" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Sun Oct 24 09:25:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 24 09:25:49 2010 -0700" }, "message": "am 60607a90: Make sure that when the screen is off, we don\\\u0027t try to turn the buttons on too.\n\nMerge commit \u002760607a9012c9b7d39bef8fcf0284772f1b061efc\u0027 into gingerbread-plus-aosp\n\n* commit \u002760607a9012c9b7d39bef8fcf0284772f1b061efc\u0027:\n Make sure that when the screen is off, we don\u0027t try to turn the buttons on too.\n" }, { "commit": "b04e3940d190458ae46e2aa10667a667398cd87a", "tree": "cb06fcf22db54da68807ce440eac94c0d53d2521", "parents": [ "c6d813b0c5c21ab4e8ff920d181c5a29b7bb9f22" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Jul 15 14:58:25 2010 -0400" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Sun Oct 24 08:52:08 2010 -0700" }, "message": "Fixes for simulator build on lucid\n\nstrchr and strrchr now return const char* instead of char*\n\nChange-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358\n" }, { "commit": "c6d813b0c5c21ab4e8ff920d181c5a29b7bb9f22", "tree": "1640c6e07f9b4d795bdc53ba498077153bf38f59", "parents": [ "5a9d2737181768a1da54d4e7fb00a6b1b86b3860", "38655c008847bc17b0d167e0e8a596a561e6ff9c" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Sun Oct 24 05:26:09 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Oct 24 05:26:09 2010 -0700" }, "message": "Merge \"Introduce a list of all the audio files\" into gingerbread-plus-aosp" }, { "commit": "60607a9012c9b7d39bef8fcf0284772f1b061efc", "tree": "fef35348a027e9846d27c86dca77c73327d10d88", "parents": [ "b6a2256e5461160a89d077b761d3253d95ce869f" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Sat Oct 23 14:49:30 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Sat Oct 23 14:49:57 2010 -0700" }, "message": "Make sure that when the screen is off, we don\u0027t try to turn the buttons on too.\n\nBug: 3117801\nChange-Id: I763f114a2b0426660d29bbda04ea7db12c1137e8\n" }, { "commit": "c3db858de9fa152480b9cf53c8c0cb793a280722", "tree": "ba337dd2df79d211a940727c5c93c112cf0de77d", "parents": [ "b6a2256e5461160a89d077b761d3253d95ce869f" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Oct 20 15:33:38 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sat Oct 23 03:52:57 2010 -0700" }, "message": "Add unit tests for native input and fix bugs identified.\n\nFixed a bug where we would lose the first touch point when swiping out of\nthe virtual key area.\n\nFixed a bug where we would not send an ACTION_MOVE event in cases where\nindividual pointers went down/up and the remaining pointers actually moved.\nThis is important since many applications do not handle pointer movements\nduring ACTION_POINTER_DOWN or ACTION_POINTER_UP. In the case of\nACTION_POINTER_UP the movement was completely lost since all pointers were\ndispatched using their old location rather than the new location.\n\nImproved motion event validation to check for duplicate pointer ids.\n\nAdded an input source constant that was missing from the NDK api but\ndefined in the framework api.\n\nAdded a timestamp when reporting added/removed devices in EventHub.\n\nBug: 3070082\nChange-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56\n" }, { "commit": "38655c008847bc17b0d167e0e8a596a561e6ff9c", "tree": "97d9d3168dca5435f56c2311f2e587ee8cbcde49", "parents": [ "d13f5f4fea0dd03cbbfc4a9ec711c4ffcc91655b" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Oct 22 18:56:52 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Oct 22 18:56:52 2010 -0700" }, "message": "Introduce a list of all the audio files\n\nChange-Id: Id52870e4d491bf074d5aa6f77d749397710ff316\n" }, { "commit": "5a9d2737181768a1da54d4e7fb00a6b1b86b3860", "tree": "32a440e34b2263581c9e4e49debe936844229905", "parents": [ "d3f5bf5aac395cdc7c2faa173141b69adea6e274", "b6a2256e5461160a89d077b761d3253d95ce869f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Oct 22 18:41:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 18:41:29 2010 -0700" }, "message": "am b6a2256e: Merge \"Fix issue 3126094.\" into gingerbread\n\nMerge commit \u0027b6a2256e5461160a89d077b761d3253d95ce869f\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b6a2256e5461160a89d077b761d3253d95ce869f\u0027:\n Fix issue 3126094.\n" }, { "commit": "b6a2256e5461160a89d077b761d3253d95ce869f", "tree": "2627006f85184d710aa9e224b92754544a291f3b", "parents": [ "ecae6e06a3bed9b6ab108629e4180fe55f4726ed", "cc02ac54ac0758e6f44b2d8e5134ff1b2fa96409" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Oct 22 18:37:09 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 22 18:37:09 2010 -0700" }, "message": "Merge \"Fix issue 3126094.\" into gingerbread" }, { "commit": "d3f5bf5aac395cdc7c2faa173141b69adea6e274", "tree": "c28b2c201deee8f79691c8322820fc9c07434694", "parents": [ "288f13730e6535fb36581781196a55a6f2d198d6", "ecae6e06a3bed9b6ab108629e4180fe55f4726ed" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Oct 22 18:21:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 18:21:14 2010 -0700" }, "message": "am ecae6e06: Merge \"Import translations for status bar.\" into gingerbread\n\nMerge commit \u0027ecae6e06a3bed9b6ab108629e4180fe55f4726ed\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ecae6e06a3bed9b6ab108629e4180fe55f4726ed\u0027:\n Import translations for status bar.\n" }, { "commit": "288f13730e6535fb36581781196a55a6f2d198d6", "tree": "009a95e38308dbd15231d7aa5ed5a1c7d939465c", "parents": [ "f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59", "8de43ab5ba818b9552326d5383729b3e6fbf7c82" ], "author": { "name": "Eric Rowe", "email": "erowe@google.com", "time": "Fri Oct 22 18:21:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 18:21:09 2010 -0700" }, "message": "am 8de43ab5: Merge \"Change disable timeout for BT disable stress test\" into gingerbread\n\nMerge commit \u00278de43ab5ba818b9552326d5383729b3e6fbf7c82\u0027 into gingerbread-plus-aosp\n\n* commit \u00278de43ab5ba818b9552326d5383729b3e6fbf7c82\u0027:\n Change disable timeout for BT disable stress test\n" }, { "commit": "f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59", "tree": "a4cff1c264d14442d9a11d62bbe50761b472d6aa", "parents": [ "d13f5f4fea0dd03cbbfc4a9ec711c4ffcc91655b", "07f3bee2db8b6e93ebbf7222676bd9f468e85569" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Fri Oct 22 18:20:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 18:20:52 2010 -0700" }, "message": "am 07f3bee2: Push Tag/NdefTag implementation details into the service.\n\nMerge commit \u002707f3bee2db8b6e93ebbf7222676bd9f468e85569\u0027 into gingerbread-plus-aosp\n\n* commit \u002707f3bee2db8b6e93ebbf7222676bd9f468e85569\u0027:\n Push Tag/NdefTag implementation details into the service.\n" }, { "commit": "cc02ac54ac0758e6f44b2d8e5134ff1b2fa96409", "tree": "98a63f9806f024cb310979ac03f6637980d30503", "parents": [ "38993d8d833ca2e61111d2a828dc4f67ca7848cb" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Oct 22 18:03:35 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Oct 22 18:08:13 2010 -0700" }, "message": "Fix issue 3126094.\n\nandroid_media_Visualizer.cpp:\nDelete local reference to jArray in captureCallback() in\nthe case of waveform capture.\n\nChange-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5\n" }, { "commit": "ecae6e06a3bed9b6ab108629e4180fe55f4726ed", "tree": "aafc153c628bb979482deb79d9a33e4386f48529", "parents": [ "8de43ab5ba818b9552326d5383729b3e6fbf7c82", "4aa82a7b7a8bf9ddbc2fd421868d627ca4090f5b" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Oct 22 17:14:36 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 22 17:14:36 2010 -0700" }, "message": "Merge \"Import translations for status bar.\" into gingerbread" }, { "commit": "8de43ab5ba818b9552326d5383729b3e6fbf7c82", "tree": "cf766b879d09123bbe6089e904e3d8d0c83aebbe", "parents": [ "07f3bee2db8b6e93ebbf7222676bd9f468e85569", "867568314d160ba098c0c72558691536a2385933" ], "author": { "name": "Eric Rowe", "email": "erowe@google.com", "time": "Fri Oct 22 17:14:12 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 22 17:14:12 2010 -0700" }, "message": "Merge \"Change disable timeout for BT disable stress test\" into gingerbread" }, { "commit": "4aa82a7b7a8bf9ddbc2fd421868d627ca4090f5b", "tree": "8f4346b0da67939688602bf733a4fcad74c65078", "parents": [ "36504f2d9ce6546d2dddcfaeca2b7e366679a767" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Oct 22 16:49:14 2010 -0700" }, "committer": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Oct 22 16:49:14 2010 -0700" }, "message": "Import translations for status bar.\n\nChange-Id: I5f40e9c507530fb4110da711e54465c2ae920a94\n" }, { "commit": "867568314d160ba098c0c72558691536a2385933", "tree": "9c50d102304059590c3f213977e93cdb8eabbfce", "parents": [ "7c68bc3867bf536ca58ababdd7e35c676b95f0a5" ], "author": { "name": "Eric Rowe", "email": "erowe@google.com", "time": "Fri Oct 22 16:32:22 2010 -0700" }, "committer": { "name": "Eric Rowe", "email": "erowe@google.com", "time": "Fri Oct 22 16:34:33 2010 -0700" }, "message": "Change disable timeout for BT disable stress test\n\nBug: b/3125900\nChange-Id: Ie1f599f1c418fc40c29debd1401297441a2a9db3\n" }, { "commit": "07f3bee2db8b6e93ebbf7222676bd9f468e85569", "tree": "4d1d6a9f81252ebda078954da4380b470f0b320b", "parents": [ "67496e591dca9c7faa07f6e1c8849c9d5af4edb9" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Oct 21 21:42:24 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Fri Oct 22 16:29:43 2010 -0700" }, "message": "Push Tag/NdefTag implementation details into the service.\n\nTag/NdefTag objects should just be simple data objects. Push the mapping of\ninternal tag type to public rawTarget/ndefTarget into Nfc Service.\n\nThis gives an oppurtunity to clean up some Tag/NdefTag API methods. Most\nsignificantly, adding createMockTag() and createMockNdefTag() to help with\napplication testing.\n\nThere will probably be some more tweaking of the types/targets in\nTag/NdefTag to come, this commit makes that a lot easier.\n\nAlso:\n- Introduce getActivationBytes() and getPollBytes(). These are just stubs\nfor NFC service to implement, we have feedback these are really important\nto help identify NFC tags.\n- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll\ninto 3A).\n\nChange-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "d13f5f4fea0dd03cbbfc4a9ec711c4ffcc91655b", "tree": "bd28da9c99f82e6b14041b9bc267d6a4892032c1", "parents": [ "26dc88afdb328bfbf8b149e9681d2c98b85a4c7c", "67496e591dca9c7faa07f6e1c8849c9d5af4edb9" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Oct 22 16:08:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 16:08:27 2010 -0700" }, "message": "am 67496e59: Merge \"Import revised translations. DO NOT MERGE\" into gingerbread\n" }, { "commit": "67496e591dca9c7faa07f6e1c8849c9d5af4edb9", "tree": "16c1ab1b7e78db85b4c7b50b7b33c2bba477f047", "parents": [ "a3e70a430ef66bf6d4d28e13336d6fdb47c4f0a3", "36504f2d9ce6546d2dddcfaeca2b7e366679a767" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Oct 22 16:06:37 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 22 16:06:38 2010 -0700" }, "message": "Merge \"Import revised translations. DO NOT MERGE\" into gingerbread" }, { "commit": "26dc88afdb328bfbf8b149e9681d2c98b85a4c7c", "tree": "710b50015a523b43053125ec17697b80d2f45dcf", "parents": [ "9c7489f8bdcd08990c44250cbad64399badc72be", "a3e70a430ef66bf6d4d28e13336d6fdb47c4f0a3" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Oct 22 16:01:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 16:01:34 2010 -0700" }, "message": "am a3e70a43: Merge \"Add a space before the weekday in the zh_CN lock screen date format.\" into gingerbread\n" } ], "next": "a3e70a430ef66bf6d4d28e13336d6fdb47c4f0a3" }