)]}' { "log": [ { "commit": "39fd8eb956dea32692d3d72b10b64a8597df0a40", "tree": "28e2a2d467c3f71d60114859641320f97c99c64a", "parents": [ "9a8ded7348c5b2302dd27b285b395416bc842c49" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Mon Jan 09 18:35:44 2012 +0000" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Jan 19 14:45:08 2012 -0800" }, "message": "Rename LOG_ASSERT to ALOG_ASSERT\n\nChange-Id: Ie2c7ea6560656d65bad791a61996174c75677517\n" }, { "commit": "9a8ded7348c5b2302dd27b285b395416bc842c49", "tree": "6244771b557279b7b8b8b574821b0afd80f252b2", "parents": [ "aa70226152d2084f85a96b52359dbc8476a86a45" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Fri Jan 06 19:20:56 2012 +0000" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Jan 19 14:45:03 2012 -0800" }, "message": "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)\n\nChange-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924\n" }, { "commit": "aa70226152d2084f85a96b52359dbc8476a86a45", "tree": "d9514686932670c9cd427232b9653b53ea6c5ca7", "parents": [ "53feeb42c721e8fc9285e35e679906a951f3277c" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Thu Jan 05 23:22:43 2012 +0000" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Jan 19 14:44:59 2012 -0800" }, "message": "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)\n\nChange-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb\n" }, { "commit": "53feeb42c721e8fc9285e35e679906a951f3277c", "tree": "bb48afd280bf7429d61229bfba2e733aa2805711", "parents": [ "52546c0ef96aa3e7e21482e0f9b6e982557c8da9" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Wed Jan 04 20:05:49 2012 +0000" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Jan 19 14:44:56 2012 -0800" }, "message": "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)\n\nChange-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a\n" }, { "commit": "52546c0ef96aa3e7e21482e0f9b6e982557c8da9", "tree": "54c28e0c5bf254aa29169a58baba8c1ff10b468e", "parents": [ "3812256de32e73e38ba16e50ac0451c10223d4eb" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Tue Dec 20 16:23:08 2011 +0000" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Jan 19 14:44:50 2012 -0800" }, "message": "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)\n\nChange-Id: I44f267700356967dc51e8f85ebf457dc85cfb229\n" }, { "commit": "3812256de32e73e38ba16e50ac0451c10223d4eb", "tree": "36738b11682c48374dc44c0b7c2a48a04986a019", "parents": [ "b676a05348e4c516fa8b57e33b10548e6142c3f8" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Thu Oct 20 11:56:00 2011 +0100" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Jan 19 14:44:31 2012 -0800" }, "message": "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)\n\nChange-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3\n" }, { "commit": "b676a05348e4c516fa8b57e33b10548e6142c3f8", "tree": "79cbd20823076300dffa09f7afdb3cfa8d5d4231", "parents": [ "a9798d3c1f1c9787975dc0f16e2191da95f2f0da" ], "author": { "name": "Mans Rullgard", "email": "mans@mansr.com", "time": "Tue Apr 05 17:40:06 2011 +0300" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Thu Jan 12 11:14:04 2012 +0200" }, "message": "stagefright aacenc/amrwbenc: Remove trailing whitespace\n\nThis was applied in AOSP master earlier, in commit\nb21611e5b0f1797e39e781d91ade023bac87637f, but when merged\ninto the Google internal tree in\n88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these\nchanges have been brought in. (The diff of this merge commit\nand its first parent, d94b71d, is empty.)\n\nTherefore, reapply the rest of these changes on the files\nthat still are present in the current version.\n\nChange-Id: I645a9b9134769958a11808a06163123d28d83e46\n" }, { "commit": "a9798d3c1f1c9787975dc0f16e2191da95f2f0da", "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0", "parents": [ "7e2f99569ae7d22307957abecc2e1818b4e7ab5e", "f61ea45c823814371c8ced71a4023f9b2cd05a3b" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Dec 16 08:08:07 2011 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Dec 16 08:08:07 2011 -0800" }, "message": "Reconcile with ics-mr1-release\n\nChange-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da\n" }, { "commit": "f61ea45c823814371c8ced71a4023f9b2cd05a3b", "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0", "parents": [ "44beb98b085f8e221fbe471523e69a0d174704b4" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Thu Dec 15 18:14:05 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 15 20:52:26 2011 -0800" }, "message": "SurfaceMediaSource: use the HW_TEXTURE usage bit\n\nThis change makes SurfaceMediaSource request Gralloc buffers with the\nHW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a\ntemporary workaround for what is likely a Gralloc bug.\n\nBug: 5771063\nChange-Id: I9cce615e80fc14a1644fae27ba06970c262dd179\n" }, { "commit": "44beb98b085f8e221fbe471523e69a0d174704b4", "tree": "52cb291bf974f4593277cc1142e514ebadae4b89", "parents": [ "b5aaa4a4d8f3c6f8be574b6ad8bd20fb74da6b9c" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 15 20:50:02 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 15 20:50:02 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "b5aaa4a4d8f3c6f8be574b6ad8bd20fb74da6b9c", "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0", "parents": [ "8df7a98161a07f2348f292f7691887bbb8293fef" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Thu Dec 15 18:14:05 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 15 20:18:19 2011 -0800" }, "message": "SurfaceMediaSource: use the HW_TEXTURE usage bit\n\nThis change makes SurfaceMediaSource request Gralloc buffers with the\nHW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a\ntemporary workaround for what is likely a Gralloc bug.\n\nBug: 5771063\nChange-Id: I9cce615e80fc14a1644fae27ba06970c262dd179\n" }, { "commit": "7e2f99569ae7d22307957abecc2e1818b4e7ab5e", "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0", "parents": [ "3453bf678e3d0187015cdde1c9263299ea361726", "69aac3e6cd68e8c305a41b2677123db7662efd4b" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Thu Dec 15 19:25:07 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 15 19:25:07 2011 -0800" }, "message": "am ac279de9: Merge \"SurfaceMediaSource: use the HW_TEXTURE usage bit\" into ics-mr1\n\n* commit \u0027ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f\u0027:\n SurfaceMediaSource: use the HW_TEXTURE usage bit\n" }, { "commit": "69aac3e6cd68e8c305a41b2677123db7662efd4b", "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0", "parents": [ "785ee06d106cd7958e0c151ebc6b7174d9ba861e" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Thu Dec 15 18:14:05 2011 -0800" }, "committer": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Thu Dec 15 18:36:08 2011 -0800" }, "message": "SurfaceMediaSource: use the HW_TEXTURE usage bit\n\nThis change makes SurfaceMediaSource request Gralloc buffers with the\nHW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a\ntemporary workaround for what is likely a Gralloc bug.\n\nBug: 5771063\nChange-Id: I9cce615e80fc14a1644fae27ba06970c262dd179\n" }, { "commit": "8df7a98161a07f2348f292f7691887bbb8293fef", "tree": "52cb291bf974f4593277cc1142e514ebadae4b89", "parents": [ "785ee06d106cd7958e0c151ebc6b7174d9ba861e", "d2bc4e0683eb6d1b7ac9731cc27ab46dc3e016af" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Dec 14 22:14:25 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Dec 14 22:14:25 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "3453bf678e3d0187015cdde1c9263299ea361726", "tree": "52cb291bf974f4593277cc1142e514ebadae4b89", "parents": [ "26c2a6bf34b370d467cab4753e5a4b187ba62c0f", "d2bc4e0683eb6d1b7ac9731cc27ab46dc3e016af" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Dec 14 16:05:32 2011 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Dec 14 16:05:32 2011 -0800" }, "message": "Reconcile with ics-mr1-release\n\nChange-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7\n" }, { "commit": "d2bc4e0683eb6d1b7ac9731cc27ab46dc3e016af", "tree": "52cb291bf974f4593277cc1142e514ebadae4b89", "parents": [ "e4fe3a4f41f296ac0471152542fcfd904ee50b0e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 14 10:57:05 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Dec 14 15:44:42 2011 -0800" }, "message": "Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck\n1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"\n This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n\n2. Revert \"Fixed the false drm recognition.\"\n This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.\n\n3. Revert \"Fix drm enumeration order, resolves failure to play forward lock ringtones\"\n This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.\n\n4. Revert \"Fix ANRs due to Widevine DRM plugin sniff taking too long.\"\n This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.\n\nAs a result of the reverting, many ANRs from WV sniffing are back.\n\nrelated-to-bug: 5739618\n" }, { "commit": "26c2a6bf34b370d467cab4753e5a4b187ba62c0f", "tree": "52cb291bf974f4593277cc1142e514ebadae4b89", "parents": [ "50845c903200fbf5e1e61012376516931e945e4c", "785ee06d106cd7958e0c151ebc6b7174d9ba861e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 14 13:50:08 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 14 13:50:08 2011 -0800" }, "message": "am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert \"Fix drm flag setting missed in false drm recognition fix.\" This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n\n* commit \u0027d70c64db9f67dbe8f888de6b1bdcc835226ec526\u0027:\n Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert \"Fix drm flag setting missed in false drm recognition fix.\" This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n" }, { "commit": "785ee06d106cd7958e0c151ebc6b7174d9ba861e", "tree": "52cb291bf974f4593277cc1142e514ebadae4b89", "parents": [ "19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 14 10:57:05 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 14 11:01:59 2011 -0800" }, "message": "Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck\n1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"\n This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n\n2. Revert \"Fixed the false drm recognition.\"\n This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.\n\n3. Revert \"Fix drm enumeration order, resolves failure to play forward lock ringtones\"\n This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.\n\n4. Revert \"Fix ANRs due to Widevine DRM plugin sniff taking too long.\"\n This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.\n\nAs a result of the reverting, many ANRs from WV sniffing are back.\n\nrelated-to-bug: 5739618\n" }, { "commit": "50845c903200fbf5e1e61012376516931e945e4c", "tree": "85df096ae36e2226ef9344e1ac419d8ebee8c1b2", "parents": [ "d17ce3f8c06b9dec0f20075043a7806cc0224e1b", "e4fe3a4f41f296ac0471152542fcfd904ee50b0e" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Dec 13 19:10:19 2011 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Dec 13 19:10:19 2011 -0800" }, "message": "Reconcile with ics-mr1-release\n\nChange-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8\n" }, { "commit": "e4fe3a4f41f296ac0471152542fcfd904ee50b0e", "tree": "85df096ae36e2226ef9344e1ac419d8ebee8c1b2", "parents": [ "19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883", "5061489994828273312d445e7b52aa5a337e4ea0" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Dec 13 16:03:26 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Dec 13 16:03:26 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "d17ce3f8c06b9dec0f20075043a7806cc0224e1b", "tree": "85df096ae36e2226ef9344e1ac419d8ebee8c1b2", "parents": [ "df4856c3e34231ba0998814cd1c4d9e33dd929b6", "19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 13 12:01:46 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 13 12:01:46 2011 -0800" }, "message": "am 3ab63008: Merge \"DO NOT MERGE: Support for parsing of \"folded\" RTSP header values\" into ics-mr1\n\n* commit \u00273ab630084071eb5dc7f92b4a8a617f8cef10c514\u0027:\n DO NOT MERGE: Support for parsing of \"folded\" RTSP header values\n" }, { "commit": "19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883", "tree": "85df096ae36e2226ef9344e1ac419d8ebee8c1b2", "parents": [ "a9d421d3c05b98ee5481428ca3dcb3e3245140ff" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Dec 09 15:09:56 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 13 10:09:48 2011 -0800" }, "message": "DO NOT MERGE: Support for parsing of \"folded\" RTSP header values\n\nand some tweaks to the AMR assembler contributed by Samsung (untested).\n\nChange-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1\nrelated-to-bug: 5669027\n" }, { "commit": "df4856c3e34231ba0998814cd1c4d9e33dd929b6", "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b", "parents": [ "956a9787cfaf429f951549df6e587c6ce4ac20f8", "5061489994828273312d445e7b52aa5a337e4ea0" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Dec 13 05:11:43 2011 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Dec 13 05:11:43 2011 -0800" }, "message": "Reconcile with ics-mr1-release\n\nChange-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8\n" }, { "commit": "5061489994828273312d445e7b52aa5a337e4ea0", "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b", "parents": [ "a9d421d3c05b98ee5481428ca3dcb3e3245140ff", "7e2afc451825028bdeb43e60450a730a4290dfd8" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Dec 12 22:08:59 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Dec 12 22:08:59 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "956a9787cfaf429f951549df6e587c6ce4ac20f8", "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b", "parents": [ "2a82a3a8824904f4e6750eb18dcc33ed113edbeb", "7e2afc451825028bdeb43e60450a730a4290dfd8" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Dec 12 07:59:17 2011 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Dec 12 07:59:17 2011 -0800" }, "message": "Reconcile with ics-mr1-release\n\nChange-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3\n" }, { "commit": "2a82a3a8824904f4e6750eb18dcc33ed113edbeb", "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b", "parents": [ "736d8141e8f060c79c297c5447cdbe2c7fa9e231", "a9d421d3c05b98ee5481428ca3dcb3e3245140ff" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Dec 12 07:47:34 2011 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Dec 12 07:47:43 2011 -0800" }, "message": "Merge from ics-mr1\n\nChange-Id: I209499775ddf68b380d0ec801d558e1dc86ab953\n" }, { "commit": "a9d421d3c05b98ee5481428ca3dcb3e3245140ff", "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b", "parents": [ "7e976e926dd8085a64a7add97ce09bfeca26e088" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 09 20:04:17 2011 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 09 20:04:17 2011 -0800" }, "message": "Fix drm enumeration order, resolves failure to play forward lock ringtones\n\nChange-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9\nrelated-to-bug: 5735466\n" }, { "commit": "7e2afc451825028bdeb43e60450a730a4290dfd8", "tree": "dd64d410e936b9d0a31ca606598ae34153faca4d", "parents": [ "7e976e926dd8085a64a7add97ce09bfeca26e088", "0de434f36f7610e6652604f4b7ca7c778757eeac" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Dec 09 16:17:04 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Dec 09 16:17:04 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "736d8141e8f060c79c297c5447cdbe2c7fa9e231", "tree": "dd64d410e936b9d0a31ca606598ae34153faca4d", "parents": [ "254868809d7df841112209fcbf5c191cce013f81", "7e976e926dd8085a64a7add97ce09bfeca26e088" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 09 11:13:39 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 09 11:13:39 2011 -0800" }, "message": "am ef664f62: Merge \"Fix drm flag setting missed in false drm recognition fix.\" into ics-mr1\n\n* commit \u0027ef664f62a1525e8f53d0937e889333544ffef3ad\u0027:\n Fix drm flag setting missed in false drm recognition fix.\n" }, { "commit": "7e976e926dd8085a64a7add97ce09bfeca26e088", "tree": "dd64d410e936b9d0a31ca606598ae34153faca4d", "parents": [ "d1fa3ca0eee42ffd450d579b357f39163a716ee3" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 09 08:57:23 2011 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 09 09:09:08 2011 -0800" }, "message": "Fix drm flag setting missed in false drm recognition fix.\n\nChange-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c\nrelated-to-bug: 5732033\n" }, { "commit": "254868809d7df841112209fcbf5c191cce013f81", "tree": "d8d69ce3df2f878f020f768ef96771561ea00619", "parents": [ "1da7ad123ccee937a52b833d80ea8ddf462ad9a3", "0de434f36f7610e6652604f4b7ca7c778757eeac" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Dec 09 07:11:09 2011 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Dec 09 07:11:10 2011 -0800" }, "message": "Reconcile with ics-mr1-release\n\nChange-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7\n" }, { "commit": "0de434f36f7610e6652604f4b7ca7c778757eeac", "tree": "d8d69ce3df2f878f020f768ef96771561ea00619", "parents": [ "d1fa3ca0eee42ffd450d579b357f39163a716ee3", "d9ee7329bedf754add88e6f7cb20e1814db0f6cc" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Dec 09 06:58:10 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Dec 09 06:58:10 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "1da7ad123ccee937a52b833d80ea8ddf462ad9a3", "tree": "d8d69ce3df2f878f020f768ef96771561ea00619", "parents": [ "3b42170d4ceaef29daf6fef51c06dd3d88d99a67", "d1fa3ca0eee42ffd450d579b357f39163a716ee3" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Dec 09 00:17:56 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 09 00:17:56 2011 -0800" }, "message": "am aadbd80b: Fixed the false drm recognition.\n\n* commit \u0027aadbd80b307c817698ce5110ff8e002804d1b230\u0027:\n Fixed the false drm recognition.\n" }, { "commit": "d1fa3ca0eee42ffd450d579b357f39163a716ee3", "tree": "d8d69ce3df2f878f020f768ef96771561ea00619", "parents": [ "b7b9c7b47a771e550124ae269a7b1be262039b95" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Dec 08 19:31:59 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Dec 08 21:01:31 2011 -0800" }, "message": "Fixed the false drm recognition.\n\nChange-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1\n\nrelated-to-bug: 5732033\n" }, { "commit": "d9ee7329bedf754add88e6f7cb20e1814db0f6cc", "tree": "b3a6159135c39e43306d25f3c2dd5689d0841777", "parents": [ "b7b9c7b47a771e550124ae269a7b1be262039b95", "089e65452bfe40a9f34f36be377795d175bde10b" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 08 17:35:27 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 08 17:35:27 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "3b42170d4ceaef29daf6fef51c06dd3d88d99a67", "tree": "b3a6159135c39e43306d25f3c2dd5689d0841777", "parents": [ "62c54ce5b09bab16dfabf18cc1f2dc1d9b35acf8", "b7b9c7b47a771e550124ae269a7b1be262039b95" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 13:35:53 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 08 13:35:53 2011 -0800" }, "message": "am 68f592a8: Merge \"Don\\\u0027t perform RTSP seeks right away but queue them for 200ms\" into ics-mr1\n\n* commit \u002768f592a8210af27df4339089bbee47fb602cae6a\u0027:\n Don\u0027t perform RTSP seeks right away but queue them for 200ms\n" }, { "commit": "62c54ce5b09bab16dfabf18cc1f2dc1d9b35acf8", "tree": "e6cb486b8987b716312076a28c695c10115fe61a", "parents": [ "68c79e2bd8fce31fd826c2dd93ed639984c71cb2", "1906e5c7492b9cbc88601365536a69e9a490c963" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 13:35:51 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 08 13:35:51 2011 -0800" }, "message": "am 0ba9380a: Merge \"Fix Bitreader \"putBits\" implementation, make sure we emulate timestamps\" into ics-mr1\n\n* commit \u00270ba9380a337d5e2eae9fd9e4eb8039403ed3815b\u0027:\n Fix Bitreader \"putBits\" implementation, make sure we emulate timestamps\n" }, { "commit": "b7b9c7b47a771e550124ae269a7b1be262039b95", "tree": "b3a6159135c39e43306d25f3c2dd5689d0841777", "parents": [ "1906e5c7492b9cbc88601365536a69e9a490c963", "ee736e9e74c5368db8d63214513c85cb74bb0183" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 13:33:16 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 13:33:16 2011 -0800" }, "message": "Merge \"Don\u0027t perform RTSP seeks right away but queue them for 200ms\" into ics-mr1" }, { "commit": "ee736e9e74c5368db8d63214513c85cb74bb0183", "tree": "0429919e29c8bf29d834f99bf39b7a7eccb99c89", "parents": [ "894f3ca9a9f94225bb64f36847508a91d0b17a6e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 13:04:50 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 13:04:50 2011 -0800" }, "message": "Don\u0027t perform RTSP seeks right away but queue them for 200ms\n\nand only execute the last one.\n\nChange-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000\nrelated-to-bug: 5732960\n" }, { "commit": "1906e5c7492b9cbc88601365536a69e9a490c963", "tree": "e6cb486b8987b716312076a28c695c10115fe61a", "parents": [ "894f3ca9a9f94225bb64f36847508a91d0b17a6e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 12:27:47 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 12:27:47 2011 -0800" }, "message": "Fix Bitreader \"putBits\" implementation, make sure we emulate timestamps\n\nif we don\u0027t receive npt time mapping from the rtsp server (i.e. live stream)\n\nChange-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c\nrelated-to-bug: 5660357\n" }, { "commit": "68c79e2bd8fce31fd826c2dd93ed639984c71cb2", "tree": "488facb65d3b9369ef06ca34c3dabcd3406da238", "parents": [ "d276313bf895a6810404123c0affb4b7a6a07582", "089e65452bfe40a9f34f36be377795d175bde10b" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Dec 08 10:21:43 2011 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Dec 08 10:21:43 2011 -0800" }, "message": "Reconcile with ics-mr0-release ics-mr1-release\n\nChange-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c\n" }, { "commit": "089e65452bfe40a9f34f36be377795d175bde10b", "tree": "488facb65d3b9369ef06ca34c3dabcd3406da238", "parents": [ "894f3ca9a9f94225bb64f36847508a91d0b17a6e", "434e86339ecbcc93c85617f760661c765199e118" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 08 07:00:35 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 08 07:00:35 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "d276313bf895a6810404123c0affb4b7a6a07582", "tree": "488facb65d3b9369ef06ca34c3dabcd3406da238", "parents": [ "59a6c2874abdee0123aba4d251d0c81df393efb8", "894f3ca9a9f94225bb64f36847508a91d0b17a6e" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Dec 08 00:16:22 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 08 00:16:22 2011 -0800" }, "message": "am a693a4b5: Merge \"Fix ANRs due to Widevine DRM plugin sniff taking too long.\" into ics-mr1\n\n* commit \u0027a693a4b5553584a01b8b6b3640dc0393d2d88f28\u0027:\n Fix ANRs due to Widevine DRM plugin sniff taking too long.\n" }, { "commit": "894f3ca9a9f94225bb64f36847508a91d0b17a6e", "tree": "488facb65d3b9369ef06ca34c3dabcd3406da238", "parents": [ "2c170cd8e308712674edd2cc7eebea70359d4951", "8e49b604c806eabe3eea2bd24813cdfc4b87c64c" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Dec 08 00:13:43 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 00:13:43 2011 -0800" }, "message": "Merge \"Fix ANRs due to Widevine DRM plugin sniff taking too long.\" into ics-mr1" }, { "commit": "8e49b604c806eabe3eea2bd24813cdfc4b87c64c", "tree": "8bf163231b5a4d481b9f17375ab0967727474d11", "parents": [ "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Dec 07 20:23:20 2011 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Dec 07 20:23:20 2011 -0800" }, "message": "Fix ANRs due to Widevine DRM plugin sniff taking too long.\n\nAdd a Widevine-specific format sniffer to avoid having to\nrefetch data from the remote server.\n\nChange-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60\nrelated-to-bug: 5725548\n" }, { "commit": "59a6c2874abdee0123aba4d251d0c81df393efb8", "tree": "c0f8622f3613dfbeb0975a0792cb46093e0918b8", "parents": [ "1b37b40f3c39863ecc6c404b177fc0c961f32dce", "2c170cd8e308712674edd2cc7eebea70359d4951" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Wed Dec 07 14:08:13 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 07 14:08:13 2011 -0800" }, "message": "am 54a53841: Merge \"Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\" into ics-mr1\n\n* commit \u002754a53841a9ff48ba4cd004469ae4ff77caed900a\u0027:\n Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\n" }, { "commit": "2c170cd8e308712674edd2cc7eebea70359d4951", "tree": "c0f8622f3613dfbeb0975a0792cb46093e0918b8", "parents": [ "0c4ec128aa324f99f726a314bd97e8a581f22ec5", "bab412099ab1bd3e9e942453cbb42c87ea9a59ec" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Wed Dec 07 14:05:41 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 14:05:41 2011 -0800" }, "message": "Merge \"Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\" into ics-mr1" }, { "commit": "bab412099ab1bd3e9e942453cbb42c87ea9a59ec", "tree": "c0f8622f3613dfbeb0975a0792cb46093e0918b8", "parents": [ "72936144fd16d6d73b7383b634d53909f4887d2b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Dec 07 12:50:47 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Dec 07 12:50:47 2011 -0800" }, "message": "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\n\nChange-Id: Icb10c129249bb9b69e91f6633a385840c94efa59\nrelated-to-bug: 5666532\n" }, { "commit": "1b37b40f3c39863ecc6c404b177fc0c961f32dce", "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b", "parents": [ "fcab2a8d5644875361f39f271fa9ffde59709c07", "0c4ec128aa324f99f726a314bd97e8a581f22ec5" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Dec 07 07:27:57 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 07 07:27:57 2011 -0800" }, "message": "am 3de8d36b: Reconcile with ics-mr0-release\n\n* commit \u00273de8d36b6fd166cf63ca256c455c0ea26a849668\u0027:\n DO NOT MERGE: Remove the AVI extractor.\n Disable wifiwatchdog for now\n" }, { "commit": "0c4ec128aa324f99f726a314bd97e8a581f22ec5", "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b", "parents": [ "72936144fd16d6d73b7383b634d53909f4887d2b", "01fe81c26d27af4d2e24482dcf2b910d983b0f7c" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Dec 07 07:24:54 2011 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Dec 07 07:24:54 2011 -0800" }, "message": "Reconcile with ics-mr0-release\n\nChange-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47\n" }, { "commit": "434e86339ecbcc93c85617f760661c765199e118", "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b", "parents": [ "72936144fd16d6d73b7383b634d53909f4887d2b", "5f14e44ef801dd2c3e35f816bdc8c709482d8ebb" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Dec 06 16:54:17 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Dec 06 16:54:17 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "fcab2a8d5644875361f39f271fa9ffde59709c07", "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b", "parents": [ "78074d5dc8122d750d97065a6d5ec419e26350d4", "72936144fd16d6d73b7383b634d53909f4887d2b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 16:22:07 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 06 16:22:07 2011 -0800" }, "message": "am 791a3183: Merge \"Merge commit \\\u0027babb7200\\\u0027 into manualmerge\" into ics-mr1\n\n* commit \u0027791a31832ab586f056c2bcab8e0515d4bb1e2f7a\u0027:\n DO NOT MERGE: Remove the AVI extractor.\n" }, { "commit": "72936144fd16d6d73b7383b634d53909f4887d2b", "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b", "parents": [ "e74de52d4e22fc61d41f703672fa8f1215446ab5", "62157c64096fe7065d4f99ad21edda41b208a808" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 15:03:10 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 15:03:10 2011 -0800" }, "message": "Merge commit \u0027babb7200\u0027 into manualmerge\n" }, { "commit": "01fe81c26d27af4d2e24482dcf2b910d983b0f7c", "tree": "25e0529e98839abf121158098a13b96a01314bbd", "parents": [ "91e2c7d2988c4947aca8a637f88a2179d905b970" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 10:59:48 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Dec 06 14:23:38 2011 -0800" }, "message": "DO NOT MERGE: Remove the AVI extractor.\n\nChange-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0\n" }, { "commit": "78074d5dc8122d750d97065a6d5ec419e26350d4", "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b", "parents": [ "4a5110810e7d5b833f08cca3855225521a20230c", "e74de52d4e22fc61d41f703672fa8f1215446ab5" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Dec 06 12:55:39 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 06 12:55:39 2011 -0800" }, "message": "am 6b8b5a0a: Merge \"DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\" into ics-mr1\n\n* commit \u00276b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3\u0027:\n DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\n" }, { "commit": "e74de52d4e22fc61d41f703672fa8f1215446ab5", "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b", "parents": [ "f7b5cdd410cb8fdd46bac5b5098e0f01442bba12", "223e70d6bde101349cba04b20ef243730cf84c07" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Dec 06 12:52:52 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 06 12:52:52 2011 -0800" }, "message": "Merge \"DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\" into ics-mr1" }, { "commit": "4a5110810e7d5b833f08cca3855225521a20230c", "tree": "93705014698e68b09f4558f9406cd2c6e34a5ef0", "parents": [ "c4ce69a593d3e565877163a8703f72aa6b451a38", "f7b5cdd410cb8fdd46bac5b5098e0f01442bba12" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 12:46:46 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 06 12:46:46 2011 -0800" }, "message": "am 05d63069: Merge \"DO NOT MERGE: Remove the AVI extractor.\" into ics-mr1\n\n* commit \u002705d630691127c022befd071b2bede87c707112a9\u0027:\n DO NOT MERGE: Remove the AVI extractor.\n" }, { "commit": "f7b5cdd410cb8fdd46bac5b5098e0f01442bba12", "tree": "93705014698e68b09f4558f9406cd2c6e34a5ef0", "parents": [ "9e603e057d6cc80e6b7e948b9af13b1a7b736008" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 10:01:27 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 11:24:34 2011 -0800" }, "message": "DO NOT MERGE: Remove the AVI extractor.\n\nChange-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e\n" }, { "commit": "62157c64096fe7065d4f99ad21edda41b208a808", "tree": "25e0529e98839abf121158098a13b96a01314bbd", "parents": [ "91e2c7d2988c4947aca8a637f88a2179d905b970" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 10:59:48 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 11:21:02 2011 -0800" }, "message": "DO NOT MERGE: Remove the AVI extractor.\n\nChange-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0\n" }, { "commit": "5f14e44ef801dd2c3e35f816bdc8c709482d8ebb", "tree": "7db009c66d5cc856ea1fb042a916a7b395972169", "parents": [ "9e603e057d6cc80e6b7e948b9af13b1a7b736008", "36126b2f17223803c981e4ff7bca2d751d971753" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Dec 05 20:36:01 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Dec 05 20:36:01 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "c4ce69a593d3e565877163a8703f72aa6b451a38", "tree": "7db009c66d5cc856ea1fb042a916a7b395972169", "parents": [ "1a733a33e1428f577747fcd74dccd8853bd1b29f", "9e603e057d6cc80e6b7e948b9af13b1a7b736008" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Dec 05 17:22:58 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 05 17:22:58 2011 -0800" }, "message": "am 7b6aff23: Merge \"audioflinger: fix audio skipping over A2DP\" into ics-mr1\n\n* commit \u00277b6aff23735a9ef8759c5ecb4427784413e9b85b\u0027:\n audioflinger: fix audio skipping over A2DP\n" }, { "commit": "9e603e057d6cc80e6b7e948b9af13b1a7b736008", "tree": "7db009c66d5cc856ea1fb042a916a7b395972169", "parents": [ "a0f2bf56e30f580535229fa6a58e7d48b762727c", "162b40bbaf3c3a24f61a6636bef6f80a9c0a31dd" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Dec 05 17:20:53 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 05 17:20:53 2011 -0800" }, "message": "Merge \"audioflinger: fix audio skipping over A2DP\" into ics-mr1" }, { "commit": "223e70d6bde101349cba04b20ef243730cf84c07", "tree": "5d8f574d8faaea100cb3937e3cf8e0b0b8f7b427", "parents": [ "a0f2bf56e30f580535229fa6a58e7d48b762727c" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Dec 05 12:41:06 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Dec 05 14:29:18 2011 -0800" }, "message": "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\n\nThe current logic does not check the I-frame at zeroeth position and therefore\nfor the files with only 1 I-Frame at zeroeth postion does not play.\n\nOriginally authored by Braganza Sam Robertsh \u003csam.braganza@samsung.com\u003e\n\nDo not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.\n\nChange-Id: I068184dec71986f14a586f769c2af1f52b4bcf94\nrelated-to-bug: 5711942\n" }, { "commit": "1a733a33e1428f577747fcd74dccd8853bd1b29f", "tree": "f375e7f5e9f183289bbd5c907f90b89924f11aa8", "parents": [ "fa845c6d4637fee51b34d9c1cf06db42b97ac0f4", "a0f2bf56e30f580535229fa6a58e7d48b762727c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 12:03:41 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 05 12:03:41 2011 -0800" }, "message": "am f2e12498: Merge \"Properly identify how much metadata we need to cache in order to instantiate\" into ics-mr1\n\n* commit \u0027f2e1249846a17c69d728189a8dc67f37261f0a59\u0027:\n Properly identify how much metadata we need to cache in order to instantiate\n" }, { "commit": "a0f2bf56e30f580535229fa6a58e7d48b762727c", "tree": "f375e7f5e9f183289bbd5c907f90b89924f11aa8", "parents": [ "fed8bb604c31bf6a60ca84aafed016d21d3e0f90" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 11:34:43 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 11:34:43 2011 -0800" }, "message": "Properly identify how much metadata we need to cache in order to instantiate\n\nthe extractor without blocking (and therefore be able to abort).\n\nChange-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3\nrelated-to-bug: 5666532\n" }, { "commit": "162b40bbaf3c3a24f61a6636bef6f80a9c0a31dd", "tree": "799acc096d19121f9d7ec271bfdcb4f65a118df2", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Dec 05 09:47:19 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Dec 05 10:40:18 2011 -0800" }, "message": "audioflinger: fix audio skipping over A2DP\n\nThe maximum sleep time allowed in the mixer thread when audio tracks\nare enabled but not ready for mixing is derived from the latency\nreported by the output stream.\nThis does not work for A2DP where the latency also reflects encoding, decoding\nand transfer time.\n\nModified activeSleepTimeUs() to take A2DP case into account.\n\nIssue 5682206.\n\nChange-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35\n" }, { "commit": "36126b2f17223803c981e4ff7bca2d751d971753", "tree": "b6241932aebde1c0f71c9d52d63bb2ea7ef5adf7", "parents": [ "fed8bb604c31bf6a60ca84aafed016d21d3e0f90", "42fb390d04ae77ff72a1ff41d32be04079b3c98b" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Dec 02 16:21:23 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Dec 02 16:21:23 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "fa845c6d4637fee51b34d9c1cf06db42b97ac0f4", "tree": "b6241932aebde1c0f71c9d52d63bb2ea7ef5adf7", "parents": [ "7570af16ad9ad892d9cff6d733d29a25d736586d", "fed8bb604c31bf6a60ca84aafed016d21d3e0f90" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 13:22:17 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 02 13:22:17 2011 -0800" }, "message": "am 1a3ece9f: Merge \"MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\" into ics-mr1\n\n* commit \u00271a3ece9f871c94eb524543ae618a2a1c88cab2cd\u0027:\n MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\n" }, { "commit": "7570af16ad9ad892d9cff6d733d29a25d736586d", "tree": "89d39512087cd15a3fb44a8bb5f28e36303eeb19", "parents": [ "1d26d11ebdc2cd53691b868e7dde844a708896a1", "8af4c7d02fc484ed1bdc082fc2a5383bc50f2180" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 13:22:15 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 02 13:22:15 2011 -0800" }, "message": "am 7f87d9cf: Merge \"MTP: Don\\\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\" into ics-mr1\n\n* commit \u00277f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1\u0027:\n MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\n" }, { "commit": "fed8bb604c31bf6a60ca84aafed016d21d3e0f90", "tree": "b6241932aebde1c0f71c9d52d63bb2ea7ef5adf7", "parents": [ "8af4c7d02fc484ed1bdc082fc2a5383bc50f2180" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Dec 01 16:58:41 2011 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 15:12:47 2011 -0500" }, "message": "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\n\nBug: 5527220\n\nChange-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "8af4c7d02fc484ed1bdc082fc2a5383bc50f2180", "tree": "89d39512087cd15a3fb44a8bb5f28e36303eeb19", "parents": [ "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Dec 01 18:36:06 2011 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 15:12:30 2011 -0500" }, "message": "MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\n\nThis could happen sometimes if other operations increased the size of the\ndata packet buffer to \u003e 16K\n\nChange-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "42fb390d04ae77ff72a1ff41d32be04079b3c98b", "tree": "fba9ea601042188ab396e20cb69e98ffe6ff6290", "parents": [ "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f", "2907dac07c264b45d43b44d304fbe1865bd8c41f" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 01 16:45:56 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Dec 01 16:45:56 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "1d26d11ebdc2cd53691b868e7dde844a708896a1", "tree": "fba9ea601042188ab396e20cb69e98ffe6ff6290", "parents": [ "15031854d15ffcc5c955290f61aa59aa09e1fde9", "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:20:09 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 01 10:20:09 2011 -0800" }, "message": "am 2c2ed7be: Merge \"Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\" into ics-mr1\n\n* commit \u00272c2ed7bef931f43dc0701ab723beb0cbed2cb630\u0027:\n Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n" }, { "commit": "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f", "tree": "fba9ea601042188ab396e20cb69e98ffe6ff6290", "parents": [ "21befea3720fb847aef5440d507902d8705a671a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:02:37 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:02:37 2011 -0800" }, "message": "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n\nChange-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab\nrelated-to-bug: 5696324\n" }, { "commit": "2907dac07c264b45d43b44d304fbe1865bd8c41f", "tree": "d0cf40e356b3fdd74a907275b45f41680287eb3f", "parents": [ "21befea3720fb847aef5440d507902d8705a671a", "d748311537c4856433afa6f812945b2c1a1bcb74" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Nov 30 06:46:17 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Nov 30 06:46:17 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "15031854d15ffcc5c955290f61aa59aa09e1fde9", "tree": "d0cf40e356b3fdd74a907275b45f41680287eb3f", "parents": [ "8a1fac32b307cfa096b343f219d471365b657ad8", "21befea3720fb847aef5440d507902d8705a671a" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Tue Nov 29 17:26:32 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 17:26:32 2011 -0800" }, "message": "am 6f1dd757: Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1\n\n* commit \u00276f1dd757cb158d17c76baeb170f7db2271802ef8\u0027:\n SurfaceMediaSource: use the vid enc usage bit\n" }, { "commit": "21befea3720fb847aef5440d507902d8705a671a", "tree": "d0cf40e356b3fdd74a907275b45f41680287eb3f", "parents": [ "7609b2304379fd6d3e5c8d13a34c680441dc48b6", "4c57986f963c81fc7c2455deb113c9b32b135468" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Tue Nov 29 17:25:09 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 17:25:09 2011 -0800" }, "message": "Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1" }, { "commit": "8a1fac32b307cfa096b343f219d471365b657ad8", "tree": "8cd10d7ed5228247ee71cdf01dd8619ab1ee4999", "parents": [ "b96d3c5195b148c0d695a326fa9c315561d787ef", "7609b2304379fd6d3e5c8d13a34c680441dc48b6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:12:21 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 14:12:21 2011 -0800" }, "message": "am 564fee36: Merge \"Make sure we can properly shutdown even if\" into ics-mr1\n\n* commit \u0027564fee36667e2699c59a29102136220dc2f65862\u0027:\n Make sure we can properly shutdown even if\n" }, { "commit": "b96d3c5195b148c0d695a326fa9c315561d787ef", "tree": "a3af410cc5f0990f5caf0bf01fc77702acdfc247", "parents": [ "6bf045c85526312b198733ac8113cc213c8d79c9", "5274010d068b05333e3e5544d59ca284802b1a8e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:12:20 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 14:12:20 2011 -0800" }, "message": "am d12dc284: Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1\n\n* commit \u0027d12dc28460f622ab29e83fa688ad83a8263e9417\u0027:\n If an error occurs that prevents us from reallocating buffers during a format change\n" }, { "commit": "6bf045c85526312b198733ac8113cc213c8d79c9", "tree": "8a757cc879f9a06bf4b13a94d3831a48787871dd", "parents": [ "b19386fe52b727524de59a7673b2f56b2e707d51", "544ee287d01d98efbe9eeeaeb7016c8dd55e3748" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:12:18 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 14:12:18 2011 -0800" }, "message": "am 351143fb: Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1\n\n* commit \u0027351143fb0e2fcfb7dc2ef1045d693c71eb0ea329\u0027:\n Updated (internal) API for IStreamSource to signal discontinuities\n" }, { "commit": "b19386fe52b727524de59a7673b2f56b2e707d51", "tree": "001b5d677ee599a4d6f8d1ba636fbf4e5f0c6a4e", "parents": [ "3aadf3a399dc9d14ed85c09c30d4726e2c90536a", "6e3d311b6631b12aac2879d1b08c3534aece78b1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:10:09 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 14:10:09 2011 -0800" }, "message": "am 405a4e34: Merge \"Finer granularity discontinuity support.\" into ics-mr1\n\n* commit \u0027405a4e34032f8a07028138266fe9f79f6753b466\u0027:\n Finer granularity discontinuity support.\n" }, { "commit": "7609b2304379fd6d3e5c8d13a34c680441dc48b6", "tree": "8cd10d7ed5228247ee71cdf01dd8619ab1ee4999", "parents": [ "5274010d068b05333e3e5544d59ca284802b1a8e", "b58ce9f5e8d0696f9571a94ba5fc05f4500f663f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:09:10 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:09:10 2011 -0800" }, "message": "Merge \"Make sure we can properly shutdown even if\" into ics-mr1" }, { "commit": "5274010d068b05333e3e5544d59ca284802b1a8e", "tree": "a3af410cc5f0990f5caf0bf01fc77702acdfc247", "parents": [ "544ee287d01d98efbe9eeeaeb7016c8dd55e3748", "d3d822204249eaca4259bdf46f6f0357b96e8e21" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:09:03 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:09:03 2011 -0800" }, "message": "Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1" }, { "commit": "544ee287d01d98efbe9eeeaeb7016c8dd55e3748", "tree": "8a757cc879f9a06bf4b13a94d3831a48787871dd", "parents": [ "6e3d311b6631b12aac2879d1b08c3534aece78b1", "bfcc8d8ab7c56bc013bd221a29e1ecf3a6390813" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:08:45 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:08:45 2011 -0800" }, "message": "Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1" }, { "commit": "bfcc8d8ab7c56bc013bd221a29e1ecf3a6390813", "tree": "0469bc8cc740ad84a42b502ba57e02b3e520748a", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 11:57:35 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 11:59:10 2011 -0800" }, "message": "Updated (internal) API for IStreamSource to signal discontinuities\n\nChange-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96\nrelated-to-bug: 5553055\n" }, { "commit": "6e3d311b6631b12aac2879d1b08c3534aece78b1", "tree": "001b5d677ee599a4d6f8d1ba636fbf4e5f0c6a4e", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 12:36:11 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 16:45:13 2011 -0800" }, "message": "Finer granularity discontinuity support.\n\nNo clients can signal a format change on either audio or video track (or both)\nand a time discontinuity (timestamps changed) independantly.\n\nChange-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f\nrelated-to-bug: 5553055\n" }, { "commit": "b58ce9f5e8d0696f9571a94ba5fc05f4500f663f", "tree": "4c30ef7b134b02bd84cb0d7dc7407c27f5c945a3", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 16:27:35 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 16:27:35 2011 -0800" }, "message": "Make sure we can properly shutdown even if\n\na) one of the two decoders has a pending discontinuity\nb) the renderer holds on to all output buffers for that decoder\nc) the renderer is paused\n\nif all three conditions are met the decoder won\u0027t ask for more input data\nand therefore never see the discontinuity.\n\nTo avoid this we briefly resume the renderer just before shutting down.\n\nChange-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a\nrelated-to-bug: 5655016\n" }, { "commit": "d748311537c4856433afa6f812945b2c1a1bcb74", "tree": "c251630c9b785aa555c7093b2691fe1f75b7a6dc", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6", "a1f988df2d273b716fd36f888c228fc94143d237" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Nov 28 12:22:27 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Nov 28 12:22:27 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "d3d822204249eaca4259bdf46f6f0357b96e8e21", "tree": "f48558114991dfd8e267b6c166367cff7353305b", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 10:54:12 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 10:54:12 2011 -0800" }, "message": "If an error occurs that prevents us from reallocating buffers during a format change\n\nwe need to transition to executing state anyway to be able to properly flush/shutdown\nin the future.\n\nChange-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f\nrelated-to-bug: 5655016\n" }, { "commit": "3aadf3a399dc9d14ed85c09c30d4726e2c90536a", "tree": "c251630c9b785aa555c7093b2691fe1f75b7a6dc", "parents": [ "a0c986cc09531e208af17e62ea6f0f47841705cc", "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Nov 23 12:32:53 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 23 12:32:53 2011 -0800" }, "message": "am 20398fac: Merge \"audioflinger: reduce sleep time to avoid underrun\" into ics-mr1\n\n* commit \u002720398fac99ff78cb3ec3dd122930e45d409e0524\u0027:\n audioflinger: reduce sleep time to avoid underrun\n" }, { "commit": "7cafbb32999049873d4746ba83bd20c88abe6ce6", "tree": "c251630c9b785aa555c7093b2691fe1f75b7a6dc", "parents": [ "e933cb5ae546d023ab756391a135c170874e7901" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Nov 22 18:50:29 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Nov 22 18:50:29 2011 -0800" }, "message": "audioflinger: reduce sleep time to avoid underrun\n\nProgressively reduce the sleep time applied in MixerThread::threadLoop()\nin case of consecutive application underruns to avoid starving the audio HAL.\nAs the default sleep time is longer than the duration of an audio buffer\nwe ended up writing less data than needed by the audio HAL if\nthe condition persisted.\n\nIssue 5553055.\n\nChange-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5\n" }, { "commit": "a1f988df2d273b716fd36f888c228fc94143d237", "tree": "8f79a2e61ce7f69d24918e19d7a232ff12b252b3", "parents": [ "6f5cc45c48c02173bfae8d54b54a92c9bae256a1", "aaa12ed10abb5d8ed6a1a939885114d1c87c9b7c" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Nov 22 11:56:20 2011 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Nov 22 11:56:20 2011 -0800" }, "message": "merge in ics-mr1-release history after reset to ics-mr1\n" }, { "commit": "a0c986cc09531e208af17e62ea6f0f47841705cc", "tree": "4a538f125f876469ea59e173b9d3645000c91cd4", "parents": [ "88b00e9b79a0242251435b399971be4ca9738395", "e933cb5ae546d023ab756391a135c170874e7901" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 22 08:41:04 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 22 08:41:04 2011 -0800" }, "message": "am cb6fbc89: Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1\n\n* commit \u0027cb6fbc89c25298643ab342b4a228e772b0e56978\u0027:\n Report a runtime error instead of asserting on malformed avc configuration data.\n" }, { "commit": "e933cb5ae546d023ab756391a135c170874e7901", "tree": "4a538f125f876469ea59e173b9d3645000c91cd4", "parents": [ "e8e5f86e9e310b065596c8cbbca1543eb833dee1", "71b61a960ae30df990976ca5dbe780d85a15b0d1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 22 08:39:11 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 22 08:39:11 2011 -0800" }, "message": "Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1" }, { "commit": "88b00e9b79a0242251435b399971be4ca9738395", "tree": "9093e89f8a7bf9544061fdfbe52383ae314e28b4", "parents": [ "26900df26fe5b55ddc804df097162ffbd9b81d0a", "e8e5f86e9e310b065596c8cbbca1543eb833dee1" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 21 20:29:59 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 21 20:29:59 2011 -0800" }, "message": "am 02740dc4: Merge \"Fix log spamming during time lapse video recording\" into ics-mr1\n\n* commit \u002702740dc49df86fc94c872454aa9db98737d5e8c8\u0027:\n Fix log spamming during time lapse video recording\n" }, { "commit": "4c57986f963c81fc7c2455deb113c9b32b135468", "tree": "a7c275b861fd66017002efa82eb25e08e096f652", "parents": [ "6f5cc45c48c02173bfae8d54b54a92c9bae256a1" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Mon Nov 21 16:51:47 2011 -0800" }, "committer": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Mon Nov 21 17:48:19 2011 -0800" }, "message": "SurfaceMediaSource: use the vid enc usage bit\n\nThis change makes SurfaceMediaSource add the VIDEO_ENC usage bit when\nallocating its GraphicBuffers rather than the HW_TEXTURE bit.\n\nChange-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb\n" }, { "commit": "e8e5f86e9e310b065596c8cbbca1543eb833dee1", "tree": "9093e89f8a7bf9544061fdfbe52383ae314e28b4", "parents": [ "6f5cc45c48c02173bfae8d54b54a92c9bae256a1" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Nov 20 09:45:44 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 21 12:09:51 2011 -0800" }, "message": "Fix log spamming during time lapse video recording\n\nChange-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f\n\nrelated-to-bug: 5626569\n" }, { "commit": "26900df26fe5b55ddc804df097162ffbd9b81d0a", "tree": "8f79a2e61ce7f69d24918e19d7a232ff12b252b3", "parents": [ "7f2bec1f9b8acc105a5779b18ab180dbe59a1b00", "6f5cc45c48c02173bfae8d54b54a92c9bae256a1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 15:10:54 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 18 15:10:54 2011 -0800" }, "message": "am 7ff7821a: am d4b22ab4: status_t !\u003d bool\n\n* commit \u00277ff7821a601a39fffb318e29873957b4a3703c46\u0027:\n status_t !\u003d bool\n" }, { "commit": "6f5cc45c48c02173bfae8d54b54a92c9bae256a1", "tree": "8f79a2e61ce7f69d24918e19d7a232ff12b252b3", "parents": [ "6479b955d21707609eae70008cf7956dddf12371", "91e2c7d2988c4947aca8a637f88a2179d905b970" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 15:07:21 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 18 15:07:21 2011 -0800" }, "message": "am d4b22ab4: status_t !\u003d bool\n\n* commit \u0027d4b22ab4889f9b1885bfc0dc45667c846a171a98\u0027:\n status_t !\u003d bool\n" }, { "commit": "91e2c7d2988c4947aca8a637f88a2179d905b970", "tree": "d73196fde1d16c5dbc71ca1f2b064db3883785d7", "parents": [ "fd8f534c7389e8215671a36a02c4666321f8816d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 13:10:56 2011 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 14:21:34 2011 -0800" }, "message": "status_t !\u003d bool\n\nb/5567433\n\nChange-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e\n" } ], "next": "71b61a960ae30df990976ca5dbe780d85a15b0d1" }