)]}' { "log": [ { "commit": "9751ad130d2e8ac7fd6b890760adbcf9a28385b9", "tree": "8dfd5fc7a1c768c32bbc9991859be2f8ad1752f7", "parents": [ "2d9e5440ef937c860b4771aaa3b6f406615eb8d2", "87b0438aed11ed7f5e7cc442a5300eb5f20ebdc5" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Jan 20 10:35:29 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 20 10:35:29 2011 -0800" }, "message": "am 4dcaeb6d: am 404946fc: Merge \"Fix issue 3371096.\" into honeycomb\n\n* commit \u00274dcaeb6d776bc87469a97001a223099c8e805579\u0027:\n Fix issue 3371096.\n" }, { "commit": "87b0438aed11ed7f5e7cc442a5300eb5f20ebdc5", "tree": "b774edcdf237529f1c1e851bbc624c495c57c510", "parents": [ "48086f7b1d7c48bc849118b0203f4fb983334ce3", "da00f9c4b83fbb0076d5cadbfca76097cb22086c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Jan 20 10:33:29 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 20 10:33:29 2011 -0800" }, "message": "am 404946fc: Merge \"Fix issue 3371096.\" into honeycomb\n\n* commit \u0027404946fc260e5dff23c8a0db12e33ff842ab4b47\u0027:\n Fix issue 3371096.\n" }, { "commit": "da00f9c4b83fbb0076d5cadbfca76097cb22086c", "tree": "c90ac3a883cc0fca45d0e5d9c1ec730c1e2045a7", "parents": [ "737be0d7937e5ab61f0ddb8db1f3835f171300f1", "73337489229cc9b50371c7a9fcd86e9f00ea46d0" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Jan 20 10:31:21 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 20 10:31:21 2011 -0800" }, "message": "Merge \"Fix issue 3371096.\" into honeycomb" }, { "commit": "2d9e5440ef937c860b4771aaa3b6f406615eb8d2", "tree": "b88e742c33d55824e827bb1afb1597ccca1e4b70", "parents": [ "e21495572bebb9c7b5fad745ca1516e53e8fd395", "48086f7b1d7c48bc849118b0203f4fb983334ce3" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 20 09:30:44 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 20 09:30:44 2011 -0800" }, "message": "am 3230f1a9: am 637739d4: Merge \"Eliminate recording sound by starting the video track before audio track.\" into honeycomb\n\n* commit \u00273230f1a97db64e2d4ac3a0c691955f1a259d425a\u0027:\n Eliminate recording sound by starting the video track before audio track.\n" }, { "commit": "48086f7b1d7c48bc849118b0203f4fb983334ce3", "tree": "48b6bc71b558aee49fedc2319d0607209d7da88e", "parents": [ "5cc52d46226bf1ab6faa8910413153c0b86dc5c9", "737be0d7937e5ab61f0ddb8db1f3835f171300f1" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 20 09:28:55 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 20 09:28:55 2011 -0800" }, "message": "am 637739d4: Merge \"Eliminate recording sound by starting the video track before audio track.\" into honeycomb\n\n* commit \u0027637739d4bf014e82af19ec4465e6031579ca6eea\u0027:\n Eliminate recording sound by starting the video track before audio track.\n" }, { "commit": "737be0d7937e5ab61f0ddb8db1f3835f171300f1", "tree": "f93f621fbd413757bf1a6489995a40ca0e0d866f", "parents": [ "91a685f1eaa32cadb461755fb235239b308953c9", "7bd460110b27a979384dda351788eac95d8467f5" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 20 09:27:01 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 20 09:27:01 2011 -0800" }, "message": "Merge \"Eliminate recording sound by starting the video track before audio track.\" into honeycomb" }, { "commit": "7bd460110b27a979384dda351788eac95d8467f5", "tree": "cd228aa4d17773047de7bcc1976892bcb979a229", "parents": [ "886c09ee81eb7b8878e487c7f801ea8ddb27c17c" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 20:42:19 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 20 06:58:16 2011 -0800" }, "message": "Eliminate recording sound by starting the video track before audio track.\n\nDue to the variable delays in the system, the recording sound can still be heard\nif the audio track is started early. This happens even after we suppress a relative\nlong period of initial audio for a recording session. By starting the video track\nbefore the audio track, we effectively play the recording sound earlier.\n\nbug - 3371141\n\nChange-Id: I2cccf77eae953d96827fc080c618b1d962445c26\n" }, { "commit": "73337489229cc9b50371c7a9fcd86e9f00ea46d0", "tree": "59fcf0e06094891a67e52540d735e59c48b1517d", "parents": [ "662cb2487ed513ff3ac26b104b5715c01d78419c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jan 19 18:36:13 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jan 19 18:36:13 2011 -0800" }, "message": "Fix issue 3371096.\n\nEffectModule::process() was copying effect chain input buffer to\noutput buffer if no effect was active instead of accumulating it.\n\nChange-Id: I2838af2e7b6654d0a76547625929a5453da68d02\n" }, { "commit": "e21495572bebb9c7b5fad745ca1516e53e8fd395", "tree": "405625778609c9d65ff20fb3571227867100f16f", "parents": [ "62c64c48f8ae8142b893b20cf08fab2cb2a1d69f", "5cc52d46226bf1ab6faa8910413153c0b86dc5c9" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jan 19 16:01:34 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 16:01:34 2011 -0800" }, "message": "am 113529f0: am a4b0cdc9: Merge \"More fix for 64 bit offset.\" into honeycomb\n\n* commit \u0027113529f062c43b111efbbd1382e23befdd1cdd30\u0027:\n More fix for 64 bit offset.\n" }, { "commit": "5cc52d46226bf1ab6faa8910413153c0b86dc5c9", "tree": "8f369f30d2ff5d39db2ceaca042f0bf917cb6df9", "parents": [ "f16e4df61fb5482adffa1a541de985c48506ff28", "91a685f1eaa32cadb461755fb235239b308953c9" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jan 19 15:59:13 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 15:59:13 2011 -0800" }, "message": "am a4b0cdc9: Merge \"More fix for 64 bit offset.\" into honeycomb\n\n* commit \u0027a4b0cdc96e309168517f4b4da24b7647668f99a7\u0027:\n More fix for 64 bit offset.\n" }, { "commit": "91a685f1eaa32cadb461755fb235239b308953c9", "tree": "271144ed0b6a7df45d55468a6002b2d903b192af", "parents": [ "1c705e94c291897d23d236a7d118a68eace74406", "2ed8a921ef55aa2f3dd4b7ac33b7ded6ec33d92d" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jan 19 15:57:23 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 19 15:57:23 2011 -0800" }, "message": "Merge \"More fix for 64 bit offset.\" into honeycomb" }, { "commit": "2ed8a921ef55aa2f3dd4b7ac33b7ded6ec33d92d", "tree": "df7cad524492b9f7f54daddd99bf1626ba89bed4", "parents": [ "886c09ee81eb7b8878e487c7f801ea8ddb27c17c" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jan 19 15:38:16 2011 -0800" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Wed Jan 19 15:38:16 2011 -0800" }, "message": "More fix for 64 bit offset.\n\nChange-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a\n" }, { "commit": "62c64c48f8ae8142b893b20cf08fab2cb2a1d69f", "tree": "9b91531027304bb44f6fa50773cf5ff2319f64ac", "parents": [ "2c036f7a42f813f814308421a61b84502e3a355a", "f16e4df61fb5482adffa1a541de985c48506ff28" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 15:28:29 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 15:28:29 2011 -0800" }, "message": "am 559da2fd: am 3cd6302b: Merge \"Prefill the cache before trying to instantiate the media extractor.\" into honeycomb\n\n* commit \u0027559da2fd899dcd88ccea3f7df31a27b41d6ca074\u0027:\n Prefill the cache before trying to instantiate the media extractor.\n" }, { "commit": "f16e4df61fb5482adffa1a541de985c48506ff28", "tree": "87f6ecb9f017a00d7dc67aca6a7dcc520269fbe0", "parents": [ "cafbd578dcff2bcbe025b2757f9a163f2b8a5398", "1c705e94c291897d23d236a7d118a68eace74406" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 15:24:28 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 15:24:28 2011 -0800" }, "message": "am 3cd6302b: Merge \"Prefill the cache before trying to instantiate the media extractor.\" into honeycomb\n\n* commit \u00273cd6302b9e54ff888df5eb47b35d25e7dac1d763\u0027:\n Prefill the cache before trying to instantiate the media extractor.\n" }, { "commit": "1c705e94c291897d23d236a7d118a68eace74406", "tree": "3b7604c65dba8ecd02ea946b1665a51e8d4fa4c8", "parents": [ "886c09ee81eb7b8878e487c7f801ea8ddb27c17c", "ac05c317cd818701535c5d72ce90da98c4bae75b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 15:12:41 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 19 15:12:41 2011 -0800" }, "message": "Merge \"Prefill the cache before trying to instantiate the media extractor.\" into honeycomb" }, { "commit": "ac05c317cd818701535c5d72ce90da98c4bae75b", "tree": "7bc60e7bca5d17cad542d96782ad828a0df0c258", "parents": [ "88b7ad413c4b6d08697069b18488641d6ce31fd3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 15:07:19 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 15:07:19 2011 -0800" }, "message": "Prefill the cache before trying to instantiate the media extractor.\n\nThe latter is an operation that otherwise could block on the datasource\nfor a significant amount of time. During that time we\u0027d be unable to\nabort the preparation phase without this prefill.\n\nChange-Id: Ia42496d88a11314386ea8797d665bf4e94871e30\nrelated-to-bug: 3362836\n" }, { "commit": "2c036f7a42f813f814308421a61b84502e3a355a", "tree": "4c3b5c9f7785073c29be8db825e082e0465db42e", "parents": [ "7b6cdfc24a02f5bb72668ec7642ca06d937f981a", "cafbd578dcff2bcbe025b2757f9a163f2b8a5398" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 14:01:18 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 14:01:18 2011 -0800" }, "message": "am aa474aa6: am fc37018a: Merge \"Logging the duration range from different media tracks for recording\" into honeycomb\n\n* commit \u0027aa474aa6f9857272c5f74a14d8ab026ae8fc55c3\u0027:\n Logging the duration range from different media tracks for recording\n" }, { "commit": "cafbd578dcff2bcbe025b2757f9a163f2b8a5398", "tree": "aded59127bc298021982734aefc0a340277e33cd", "parents": [ "d049c605e68163aa01633dd76b4cc12c95cca5c5", "886c09ee81eb7b8878e487c7f801ea8ddb27c17c" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 13:59:02 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 13:59:02 2011 -0800" }, "message": "am fc37018a: Merge \"Logging the duration range from different media tracks for recording\" into honeycomb\n\n* commit \u0027fc37018a9040f9b0f7cf4dac6d6fc5a5bdd6c287\u0027:\n Logging the duration range from different media tracks for recording\n" }, { "commit": "886c09ee81eb7b8878e487c7f801ea8ddb27c17c", "tree": "395f9c04fc4728c74c700d4ac87113a434156521", "parents": [ "88b7ad413c4b6d08697069b18488641d6ce31fd3", "65b3d76025c71d755b0fb3b6ead90255f25417ed" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 13:57:06 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 19 13:57:06 2011 -0800" }, "message": "Merge \"Logging the duration range from different media tracks for recording\" into honeycomb" }, { "commit": "7b6cdfc24a02f5bb72668ec7642ca06d937f981a", "tree": "ec67b7d47ff19d55073cedf851a4593c4fca4cae", "parents": [ "02754925feadfbfb6bb07a6087e200c8d7c0cc41", "d049c605e68163aa01633dd76b4cc12c95cca5c5" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 12:01:13 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 12:01:13 2011 -0800" }, "message": "am 4026ea7c: am 0353459d: Merge \"Always revert to the previous bandwidth if the required sequence number cannot be found\" into honeycomb\n\n* commit \u00274026ea7c25089e88a49920035b937ab95ed47029\u0027:\n Always revert to the previous bandwidth if the required sequence number cannot be found\n" }, { "commit": "d049c605e68163aa01633dd76b4cc12c95cca5c5", "tree": "a2f5673618e9356ae82526216272ea65bb9b9d58", "parents": [ "6bfb9ea1529f2823c79df3e4ae83453dfa888fc4", "88b7ad413c4b6d08697069b18488641d6ce31fd3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 11:59:14 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 11:59:14 2011 -0800" }, "message": "am 0353459d: Merge \"Always revert to the previous bandwidth if the required sequence number cannot be found\" into honeycomb\n\n* commit \u00270353459d405e20750b3ddd8abad83eace1ed2a39\u0027:\n Always revert to the previous bandwidth if the required sequence number cannot be found\n" }, { "commit": "65b3d76025c71d755b0fb3b6ead90255f25417ed", "tree": "718d9853ea27847b77c0cf5c739ed6aba1b9d13b", "parents": [ "88b348910a607ae399bcd693dd42a231d98da2c9" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 11:50:19 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 11:54:59 2011 -0800" }, "message": "Logging the duration range from different media tracks for recording\n\nChange-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349\n" }, { "commit": "02754925feadfbfb6bb07a6087e200c8d7c0cc41", "tree": "0598368f90a4572d7417e2a63de893dc119f7688", "parents": [ "18f7b4d9e9e21ede59fffae70336cd08a0489841", "6bfb9ea1529f2823c79df3e4ae83453dfa888fc4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 11:35:38 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 11:35:38 2011 -0800" }, "message": "am ee48eaba: am 71bb6a2a: Merge \"Return a runtime error if decryption fails instead of asserting.\" into honeycomb\n\n* commit \u0027ee48eabab8c32104eb04e2abb6f6212b94f32211\u0027:\n Return a runtime error if decryption fails instead of asserting.\n" }, { "commit": "6bfb9ea1529f2823c79df3e4ae83453dfa888fc4", "tree": "b31808b67b8630b746bf56c12e9cf5b30bf1b139", "parents": [ "d64d62616048f733bc3034249e56641164528f05", "88b348910a607ae399bcd693dd42a231d98da2c9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 11:33:56 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 11:33:56 2011 -0800" }, "message": "am 71bb6a2a: Merge \"Return a runtime error if decryption fails instead of asserting.\" into honeycomb\n\n* commit \u002771bb6a2a3eb668fe7459cd8fff1f65a15804c3be\u0027:\n Return a runtime error if decryption fails instead of asserting.\n" }, { "commit": "88b7ad413c4b6d08697069b18488641d6ce31fd3", "tree": "36d49e5cf69bbf5b513bcffd2f94ff4c40f35578", "parents": [ "88b348910a607ae399bcd693dd42a231d98da2c9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 11:30:43 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 11:30:43 2011 -0800" }, "message": "Always revert to the previous bandwidth if the required sequence number cannot be found\n\nChange-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6\n" }, { "commit": "88b348910a607ae399bcd693dd42a231d98da2c9", "tree": "25c690dee1142a36924392b7899e447f663129f7", "parents": [ "662cb2487ed513ff3ac26b104b5715c01d78419c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 11:24:39 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 11:24:39 2011 -0800" }, "message": "Return a runtime error if decryption fails instead of asserting.\n\nChange-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a\n" }, { "commit": "18f7b4d9e9e21ede59fffae70336cd08a0489841", "tree": "6e23da78938e807810600e090bdae203fd2008bb", "parents": [ "bdbd7c6da5731becda6c467855e2240e159f8c67", "d64d62616048f733bc3034249e56641164528f05" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 10:42:15 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 10:42:15 2011 -0800" }, "message": "am 8da1ca52: am 069ee21a: Merge \"Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\" into honeycomb\n\n* commit \u00278da1ca52808f81f41919e118c3667b794ee31f6b\u0027:\n Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\n" }, { "commit": "d64d62616048f733bc3034249e56641164528f05", "tree": "fa540b83f1461d7ba9d72b64ce44ad0698118161", "parents": [ "a027eaf8b23118354ffef89b40cc36bf93f1c769", "662cb2487ed513ff3ac26b104b5715c01d78419c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 10:40:19 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 10:40:19 2011 -0800" }, "message": "am 069ee21a: Merge \"Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\" into honeycomb\n\n* commit \u0027069ee21a2012e0b6fd355253ea81a84ea11138d2\u0027:\n Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\n" }, { "commit": "662cb2487ed513ff3ac26b104b5715c01d78419c", "tree": "d4036f117ab08f04bccc46313fde7e5bbf98454a", "parents": [ "113a95462d2018c62b9e6bc86e7f643ff46f29cf", "b391290130f263441334ee4525a5832f0bea2ef0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 10:38:16 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 19 10:38:16 2011 -0800" }, "message": "Merge \"Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\" into honeycomb" }, { "commit": "b391290130f263441334ee4525a5832f0bea2ef0", "tree": "09faabdbb6c75ef535bc134eb6dad53267f66380", "parents": [ "7509d7725207bfc28f7757c18518e21110c0736d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 10:34:52 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 10:34:52 2011 -0800" }, "message": "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\n\nRefactor the logic a little.\n\nChange-Id: Idd7a26678d846c96b0b11f096305e7467381bda3\n" }, { "commit": "bdbd7c6da5731becda6c467855e2240e159f8c67", "tree": "89d2f34ea0043d46369627203e272def71d821b1", "parents": [ "761645bfdb5cb848380762491c0dde9f44027c7e", "a027eaf8b23118354ffef89b40cc36bf93f1c769" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 10:32:58 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 10:32:58 2011 -0800" }, "message": "am 6df89f2e: am 8e7d6263: Merge \"Expose average video frame rate via MPEG4Extractor\" into honeycomb\n\n* commit \u00276df89f2efc587b33134c545f594a5b1ac2cd9fbb\u0027:\n Expose average video frame rate via MPEG4Extractor\n" }, { "commit": "a027eaf8b23118354ffef89b40cc36bf93f1c769", "tree": "4e6ce5b95e04ee95ddd52a04585ced0290fac933", "parents": [ "a5939efeaf8be373ee71941466ad5a2db1750881", "113a95462d2018c62b9e6bc86e7f643ff46f29cf" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 10:31:06 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 10:31:06 2011 -0800" }, "message": "am 8e7d6263: Merge \"Expose average video frame rate via MPEG4Extractor\" into honeycomb\n\n* commit \u00278e7d626385eef104d52aa9080b70395ca840a0cd\u0027:\n Expose average video frame rate via MPEG4Extractor\n" }, { "commit": "113a95462d2018c62b9e6bc86e7f643ff46f29cf", "tree": "136c2efa65fdbbb1d4057e9aaf9ec6dbc66e4ae9", "parents": [ "e75ceba6e3f009118c5debbbe2de268beb350c9a" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 00:13:55 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 10:20:59 2011 -0800" }, "message": "Expose average video frame rate via MPEG4Extractor\n\nbug - 3362483\n\nChange-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69\n" }, { "commit": "761645bfdb5cb848380762491c0dde9f44027c7e", "tree": "33c7694370ee07314726b2e7b5636494ea38c8a4", "parents": [ "2548b06179016c69d02a1655fbf48ab07a13bb72", "a5939efeaf8be373ee71941466ad5a2db1750881" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 10:09:01 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 10:09:01 2011 -0800" }, "message": "am 1324e3b1: am 4061c9aa: Merge \"Fix the presentation video resolution when it is different from the actual image resolution of the video.\" into honeycomb\n\n* commit \u00271324e3b1a4246f77d516b37fa98013ffad91268e\u0027:\n Fix the presentation video resolution when it is different from the actual image resolution of the video.\n" }, { "commit": "a5939efeaf8be373ee71941466ad5a2db1750881", "tree": "608b74b25dd64936ede778ea8449c21d7683e14e", "parents": [ "aa46ce8ac441981ecbf9e72fb4acc6677615efc9", "e75ceba6e3f009118c5debbbe2de268beb350c9a" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 10:06:23 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 10:06:23 2011 -0800" }, "message": "am 4061c9aa: Merge \"Fix the presentation video resolution when it is different from the actual image resolution of the video.\" into honeycomb\n\n* commit \u00274061c9aa6d77bd7ad3b43d898b3e55fd62f57f18\u0027:\n Fix the presentation video resolution when it is different from the actual image resolution of the video.\n" }, { "commit": "e75ceba6e3f009118c5debbbe2de268beb350c9a", "tree": "060dc1df2f38a7d1c031af49db48ea58ea4b258f", "parents": [ "7509d7725207bfc28f7757c18518e21110c0736d", "b45c01c2b8588ff431b511151666a55a39f0a6ae" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 10:05:05 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 19 10:05:05 2011 -0800" }, "message": "Merge \"Fix the presentation video resolution when it is different from the actual image resolution of the video.\" into honeycomb" }, { "commit": "2548b06179016c69d02a1655fbf48ab07a13bb72", "tree": "ac6f62957595f7a70edcbea326f5aa614fd9138e", "parents": [ "c1fcccc92622927c1fe158c80dfaa5d6af4d4371", "aa46ce8ac441981ecbf9e72fb4acc6677615efc9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 09:53:30 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 09:53:30 2011 -0800" }, "message": "am d3bf3eea: am 2597aedb: Merge \"Turn another assertion into a runtime error. Damn you surfaces.\" into honeycomb\n\n* commit \u0027d3bf3eeadd59748b9cbe7535378b4bdf8dd8f117\u0027:\n Turn another assertion into a runtime error. Damn you surfaces.\n" }, { "commit": "aa46ce8ac441981ecbf9e72fb4acc6677615efc9", "tree": "df692b18c7892879bff2c3144e03008a859094b2", "parents": [ "09ad2d8994ac770f60607dc3b1c848531ce076e9", "7509d7725207bfc28f7757c18518e21110c0736d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 09:51:42 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 09:51:42 2011 -0800" }, "message": "am 2597aedb: Merge \"Turn another assertion into a runtime error. Damn you surfaces.\" into honeycomb\n\n* commit \u00272597aedb3869e46f945359c529e03263c77a944d\u0027:\n Turn another assertion into a runtime error. Damn you surfaces.\n" }, { "commit": "7509d7725207bfc28f7757c18518e21110c0736d", "tree": "1af0f48a1b15b6c5b41ab2500319c9337f781e75", "parents": [ "a91992013f26cd6ad293d3599c13601e0df7994d", "018761c5cc4aefd0495eaa4666f2372a59a7980a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 09:49:32 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 19 09:49:32 2011 -0800" }, "message": "Merge \"Turn another assertion into a runtime error. Damn you surfaces.\" into honeycomb" }, { "commit": "c1fcccc92622927c1fe158c80dfaa5d6af4d4371", "tree": "3f506ae65a0c05a8d9929a87d9ea3a62b0e90531", "parents": [ "f6a039c84e3bfb432a57d976d0774355217fdb4e", "09ad2d8994ac770f60607dc3b1c848531ce076e9" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jan 19 09:46:03 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 09:46:03 2011 -0800" }, "message": "am 42ac3249: am 42466b1c: Merge \"Tentative fix for issue 3362362.\" into honeycomb\n\n* commit \u002742ac32498aea67a43f666946c4b77a376f54cfaf\u0027:\n Tentative fix for issue 3362362.\n" }, { "commit": "09ad2d8994ac770f60607dc3b1c848531ce076e9", "tree": "dd1ecb335e254f0ad53f80e54f7d74640cbe5628", "parents": [ "f6e3b6d3f097fca569dad806de426a4c6af5200c", "a91992013f26cd6ad293d3599c13601e0df7994d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jan 19 09:43:17 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 09:43:17 2011 -0800" }, "message": "am 42466b1c: Merge \"Tentative fix for issue 3362362.\" into honeycomb\n\n* commit \u002742466b1cad4cec1aa746809dfcca702456415be4\u0027:\n Tentative fix for issue 3362362.\n" }, { "commit": "a91992013f26cd6ad293d3599c13601e0df7994d", "tree": "8312375d23706456f098db189ac8752e06784be1", "parents": [ "2b4883641e324c50a2ee24c5bd15170c7d31e57d", "935752053ef2691dbb6d5a6d149e0e362c6e3c74" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jan 19 09:40:34 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 19 09:40:34 2011 -0800" }, "message": "Merge \"Tentative fix for issue 3362362.\" into honeycomb" }, { "commit": "018761c5cc4aefd0495eaa4666f2372a59a7980a", "tree": "e0e4a58c37774fe7034bc4f73122156989c713cd", "parents": [ "2b4883641e324c50a2ee24c5bd15170c7d31e57d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 09:20:58 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 09:20:58 2011 -0800" }, "message": "Turn another assertion into a runtime error. Damn you surfaces.\n\nChange-Id: Ib62957180949293a6fb84bb5a40af058798337ab\nrelated-to-bug: 3335220\n" }, { "commit": "935752053ef2691dbb6d5a6d149e0e362c6e3c74", "tree": "d0c6d5a1666aa6935a032a07d7c947bc8381a747", "parents": [ "de16890e98cdd241398ed155cd47daf061584a77" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jan 18 18:39:02 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jan 19 09:04:27 2011 -0800" }, "message": "Tentative fix for issue 3362362.\n\nThe problem is likely that one method is called on the AudioPolicyManagerBase\ninstance while it is still being constructed by AudioPolicyService.\n\nTo avoid this, the AudioPolicyService mutex is held by the constructor until the\nplatform specific AudioPolicyManager is constructed and the member\nmpPolicyManager initialized.\n\nAlso added an initCheck() method to AudioPolicyInterface to verify successful\ninitialization of AudioPolicyManager.\n\nA similar change is done in AudioFlinger constructor.\nAlso added some missing protections in AudioFlinger methods where the\nplayback thread list is parsed.\n\nChange-Id: I006b244ec057e1bb0aa5ebe426ef006e3b171056\n" }, { "commit": "b45c01c2b8588ff431b511151666a55a39f0a6ae", "tree": "94a766af98d29e9b6d745e42a5f625106267a2e1", "parents": [ "2b4883641e324c50a2ee24c5bd15170c7d31e57d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Jan 16 11:30:13 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 19 08:33:07 2011 -0800" }, "message": "Fix the presentation video resolution when it is different from the actual image resolution of the video.\n\nbug - 3352413\n\nChange-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2\n" }, { "commit": "f6a039c84e3bfb432a57d976d0774355217fdb4e", "tree": "4052c8e44e4f1ff638bd39d676cd5c0b41cf083d", "parents": [ "6707d77e643182e81e0fdfc249d09bd602b02170", "f6e3b6d3f097fca569dad806de426a4c6af5200c" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 18 22:37:47 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 22:37:47 2011 -0800" }, "message": "am 456570ef: am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy\n\n* commit \u0027456570ef558d99200bdd9ffb80be22f157e17c53\u0027:\n Use metadata in video buffers for timelapse video recording by default to eliminate memcpy\n" }, { "commit": "f6e3b6d3f097fca569dad806de426a4c6af5200c", "tree": "e8d0cfc8babb9dbaaaf5db76caad6d989c58c7ea", "parents": [ "a2aba71b29fd7a201b3123736823fa2556dee2c6", "2b4883641e324c50a2ee24c5bd15170c7d31e57d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 18 22:09:21 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 22:09:21 2011 -0800" }, "message": "am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy\n\n* commit \u00275fb60c7af2cbf59a99ae324c4284c7860b37c723\u0027:\n Use metadata in video buffers for timelapse video recording by default to eliminate memcpy\n" }, { "commit": "6707d77e643182e81e0fdfc249d09bd602b02170", "tree": "8d6a88d0456db200135fa969f9a2714dbf565d8e", "parents": [ "ba89aeb3bd42fc97f9ded783cc398dbbd368b88f", "a2aba71b29fd7a201b3123736823fa2556dee2c6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 21:57:06 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 21:57:06 2011 -0800" }, "message": "am f9846fcd: am 39560507: Merge \"Apparently our native TCP sockets do not return an error from blocking \"connect\"\" into honeycomb\n\n* commit \u0027f9846fcdf89432d05c713a5f356a0bd1447d3cf1\u0027:\n Apparently our native TCP sockets do not return an error from blocking \"connect\"\n" }, { "commit": "ba89aeb3bd42fc97f9ded783cc398dbbd368b88f", "tree": "dfaeb254f7a6964848102e80d1f204fdaae679c5", "parents": [ "0bae33c783a5929fe44d41da781d56c6e109421a", "915cde53d1d1c9a1549f180d377db0b64a53233e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 18 21:54:39 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 21:54:39 2011 -0800" }, "message": "am d2225a06: am 1418de7e: Merge \"Fix the sluggish preview during timelapse video recording because software encoder is used.\" into honeycomb\n\n* commit \u0027d2225a06a315db9988236dcf5c5bca743f6d457d\u0027:\n Fix the sluggish preview during timelapse video recording because software encoder is used.\n" }, { "commit": "2b4883641e324c50a2ee24c5bd15170c7d31e57d", "tree": "affc60536acc73b632055dbb1a76c55ac6b17557", "parents": [ "de16890e98cdd241398ed155cd47daf061584a77" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 18 21:12:31 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 18 21:33:58 2011 -0800" }, "message": "Use metadata in video buffers for timelapse video recording by default to eliminate memcpy\n\nbug - 3361771\n\nChange-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9\n" }, { "commit": "0bae33c783a5929fe44d41da781d56c6e109421a", "tree": "24aca074d55d495c91dd8141655ece7522e67975", "parents": [ "fd1ad35b9cc4ffe2be3bb734c4e8bc65e9769f78", "0db958fd28db5919a6cc14c2088161160abe3788" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 20:44:04 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 20:44:04 2011 -0800" }, "message": "am 63e99c39: am 529fc53d: Merge \"Implement parsing of vbv buffering info in RTSP.\" into honeycomb\n\n* commit \u002763e99c39e1e1a0dd7989bb858447b3ca76738554\u0027:\n Implement parsing of vbv buffering info in RTSP.\n" }, { "commit": "fd1ad35b9cc4ffe2be3bb734c4e8bc65e9769f78", "tree": "acccfef2837026d86037ecf582292a40da71a8ba", "parents": [ "003845d3a65c31283256d9c94387674bfb4e746b", "e8036de113ba88646724ab6fd5d7bb5d248b46f2" ], "author": { "name": "Bryan Mawhinney", "email": "bryanmawhinney@google.com", "time": "Tue Jan 18 20:43:22 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 20:43:22 2011 -0800" }, "message": "am 6d7d0da9: am 3a4d547c: Merge \"Don\\\u0027t report 100% buffered when the stream ends prematurely.\" into honeycomb\n\n* commit \u00276d7d0da9fb5bc52282b3d1d1fc2ac6ad8a4eb01b\u0027:\n Don\u0027t report 100% buffered when the stream ends prematurely.\n" }, { "commit": "003845d3a65c31283256d9c94387674bfb4e746b", "tree": "2e23613b0ec62c9e947b369ac714c80e7c13dc4e", "parents": [ "c8452c13ead79c476f9de56e3bbf461d448b60f4", "0a32d7981b98fdfca48a1e35ca746f1cc11849d3" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jan 18 16:09:44 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 18 16:09:44 2011 -0800" }, "message": "Merge \"rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/\"" }, { "commit": "a2aba71b29fd7a201b3123736823fa2556dee2c6", "tree": "9953a2d240e66589a4fc2ccd5d70c119f84b20f5", "parents": [ "915cde53d1d1c9a1549f180d377db0b64a53233e", "de16890e98cdd241398ed155cd47daf061584a77" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 15:37:58 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 15:37:58 2011 -0800" }, "message": "am 39560507: Merge \"Apparently our native TCP sockets do not return an error from blocking \"connect\"\" into honeycomb\n\n* commit \u002739560507215774873ba64b5f0ff61648488924ea\u0027:\n Apparently our native TCP sockets do not return an error from blocking \"connect\"\n" }, { "commit": "de16890e98cdd241398ed155cd47daf061584a77", "tree": "8273f7629019c9a38090c485b550d20b1b8969e2", "parents": [ "31389148f4ab7587e150f4043b7379eaefe2af2b", "368ef16787c3fe2334dadc767e7418b610c83cbd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 15:35:35 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 18 15:35:35 2011 -0800" }, "message": "Merge \"Apparently our native TCP sockets do not return an error from blocking \"connect\"\" into honeycomb" }, { "commit": "368ef16787c3fe2334dadc767e7418b610c83cbd", "tree": "2eae79e5a3366c0f9cbaca2ff2771f4f3ed47f23", "parents": [ "bf6489f8b4c03dda70bf7a549702b98da497e348" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 15:26:40 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 15:26:40 2011 -0800" }, "message": "Apparently our native TCP sockets do not return an error from blocking \"connect\"\n\nif the network interface is shutdown while connecting.\n\nChange-Id: I1bd7e43475edf20f35e15dd4eae547126289f5f0\nrelated-to-bug: 3362836\n" }, { "commit": "0a32d7981b98fdfca48a1e35ca746f1cc11849d3", "tree": "5db5c4e1d151dfdbbfa746b552ff1f0b74ae8ce9", "parents": [ "bdda424ecfd2825c15b2360770da8c950c715c47" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jan 18 15:23:51 2011 -0800" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jan 18 15:23:51 2011 -0800" }, "message": "rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/\n\nChange-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d\n" }, { "commit": "915cde53d1d1c9a1549f180d377db0b64a53233e", "tree": "3135117b2b3a40dbc574c8630fa4b8bd6155e8c7", "parents": [ "0db958fd28db5919a6cc14c2088161160abe3788", "31389148f4ab7587e150f4043b7379eaefe2af2b" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 18 14:44:58 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 14:44:58 2011 -0800" }, "message": "am 1418de7e: Merge \"Fix the sluggish preview during timelapse video recording because software encoder is used.\" into honeycomb\n\n* commit \u00271418de7eff012c37cf34328eb368a547d70a1441\u0027:\n Fix the sluggish preview during timelapse video recording because software encoder is used.\n" }, { "commit": "31389148f4ab7587e150f4043b7379eaefe2af2b", "tree": "28d20f9c37755cbf14af6cc2d20e7a17fc213efc", "parents": [ "bf6489f8b4c03dda70bf7a549702b98da497e348" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 18 14:26:55 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 18 14:28:37 2011 -0800" }, "message": "Fix the sluggish preview during timelapse video recording because software encoder is used.\n\nbug - 3361771\n\nChange-Id: Ic5344e9eabe7f1b82910b65b4260e4ad8dc51c32\n" }, { "commit": "c8452c13ead79c476f9de56e3bbf461d448b60f4", "tree": "d05449ea25904162b20503cf811dacdfb353251c", "parents": [ "bdda424ecfd2825c15b2360770da8c950c715c47", "f203a0f833a3f215f9971444e7192bd905a11ebf" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Jan 18 12:10:31 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 12:10:31 2011 -0800" }, "message": "am f9828f65: am 0de274b3: Merge \"MTP: Fix problems with modification dates for folders and non-media files\" into honeycomb\n\n* commit \u0027f9828f6584ddbab9aab3abdbc47ef355651e7bfb\u0027:\n MTP: Fix problems with modification dates for folders and non-media files\n" }, { "commit": "0db958fd28db5919a6cc14c2088161160abe3788", "tree": "eb3ad13d1a1870803df9607f7910f4f64ab6593b", "parents": [ "e8036de113ba88646724ab6fd5d7bb5d248b46f2", "bf6489f8b4c03dda70bf7a549702b98da497e348" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 11:54:08 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 11:54:08 2011 -0800" }, "message": "am 529fc53d: Merge \"Implement parsing of vbv buffering info in RTSP.\" into honeycomb\n\n* commit \u0027529fc53d3fd298ee5aef20e3a07bd263f7376b8d\u0027:\n Implement parsing of vbv buffering info in RTSP.\n" }, { "commit": "bf6489f8b4c03dda70bf7a549702b98da497e348", "tree": "605ed35b22591607ec15680a63d6cce4002cfa6d", "parents": [ "126983a5afae1a554a8bb26711bb01edb1ddf5b1", "21a6f9ffee8b3c014abfe165b8f7fd2224f49e1f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 11:52:02 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 18 11:52:02 2011 -0800" }, "message": "Merge \"Implement parsing of vbv buffering info in RTSP.\" into honeycomb" }, { "commit": "e8036de113ba88646724ab6fd5d7bb5d248b46f2", "tree": "2d377c8491f992207a830aa5f8ed76d8048946fb", "parents": [ "f203a0f833a3f215f9971444e7192bd905a11ebf", "126983a5afae1a554a8bb26711bb01edb1ddf5b1" ], "author": { "name": "Bryan Mawhinney", "email": "bryanmawhinney@google.com", "time": "Tue Jan 18 11:31:51 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 11:31:51 2011 -0800" }, "message": "am 3a4d547c: Merge \"Don\\\u0027t report 100% buffered when the stream ends prematurely.\" into honeycomb\n\n* commit \u00273a4d547c588dc3a1abb48988595dc17874660bb8\u0027:\n Don\u0027t report 100% buffered when the stream ends prematurely.\n" }, { "commit": "126983a5afae1a554a8bb26711bb01edb1ddf5b1", "tree": "186a713ca97792b9e0763362c93ca52f30d95ac9", "parents": [ "aa95240d9096f97aa2e2022fae8764a4386c8951", "1bd233ce7e1aa7730bc18d46ffd57791391738cd" ], "author": { "name": "Bryan Mawhinney", "email": "bryanmawhinney@google.com", "time": "Tue Jan 18 11:30:30 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 18 11:30:30 2011 -0800" }, "message": "Merge \"Don\u0027t report 100% buffered when the stream ends prematurely.\" into honeycomb" }, { "commit": "f203a0f833a3f215f9971444e7192bd905a11ebf", "tree": "2603f1c8e951cc88d355afdfb65c96b15e42cbe3", "parents": [ "67cde67ff08b94ece035ac35a7a1b33b01677b1f", "aa95240d9096f97aa2e2022fae8764a4386c8951" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Jan 18 11:20:22 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 18 11:20:22 2011 -0800" }, "message": "am 0de274b3: Merge \"MTP: Fix problems with modification dates for folders and non-media files\" into honeycomb\n\n* commit \u00270de274b34c554a0e87b1071e001e41e416cd7678\u0027:\n MTP: Fix problems with modification dates for folders and non-media files\n" }, { "commit": "21a6f9ffee8b3c014abfe165b8f7fd2224f49e1f", "tree": "140750d63bf8e4e50e67bdcdd737e0af18ee79e0", "parents": [ "ccb3506ed1845121b94f4e27244e61a46eb19815" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 11:19:13 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 11:19:13 2011 -0800" }, "message": "Implement parsing of vbv buffering info in RTSP.\n\nChange-Id: I7d871cafda2c4c65670a40ad9ab4f24317f8568a\nrelated-to-bug: 3351915\n" }, { "commit": "1bd233ce7e1aa7730bc18d46ffd57791391738cd", "tree": "f260f0d8821d1f36fbfcf9f678fb80f62ec099b9", "parents": [ "ccb3506ed1845121b94f4e27244e61a46eb19815" ], "author": { "name": "Bryan Mawhinney", "email": "bryanmawhinney@google.com", "time": "Tue Jan 18 19:12:21 2011 +0000" }, "committer": { "name": "Bryan Mawhinney", "email": "bryanmawhinney@google.com", "time": "Tue Jan 18 19:12:21 2011 +0000" }, "message": "Don\u0027t report 100% buffered when the stream ends prematurely.\n\nChange-Id: Ia4e80d02f28104427a3309e3d5b155faa5702757\n" }, { "commit": "aa95240d9096f97aa2e2022fae8764a4386c8951", "tree": "ee23a4189c0152e2d5528887d5861566ef5ada6f", "parents": [ "ccb3506ed1845121b94f4e27244e61a46eb19815" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Jan 18 11:06:19 2011 -0800" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Jan 18 11:07:11 2011 -0800" }, "message": "MTP: Fix problems with modification dates for folders and non-media files\n\nAlso removed an unnecessary parameter to MtpDatabase.endSendobject()\n\nBUG: 3352142\n\nChange-Id: I6fd812dcba4814956bc8bc1cbd6bd5c868197790\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "bdda424ecfd2825c15b2360770da8c950c715c47", "tree": "17a79e1721678904dfb085dd332f97e685f4efe5", "parents": [ "125b7c567ab9a99b4982e31914ba2ad8b5cb3819", "67cde67ff08b94ece035ac35a7a1b33b01677b1f" ], "author": { "name": "Dharmaray Kundargi", "email": "dharmaray@google.com", "time": "Mon Jan 17 11:53:15 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 17 11:53:15 2011 -0800" }, "message": "am bf6ccb04: am 307003a8: Merge \"integrate videoeditor preview player.\" into honeycomb\n\n* commit \u0027bf6ccb04b93f7a2738f29f2d96a69f32f7602f51\u0027:\n integrate videoeditor preview player.\n" }, { "commit": "67cde67ff08b94ece035ac35a7a1b33b01677b1f", "tree": "09e37275bf66cc6ec260deab0910bb990b09802e", "parents": [ "f9c1f51b261d45632625b501f44f2b2214ce3352", "ccb3506ed1845121b94f4e27244e61a46eb19815" ], "author": { "name": "Dharmaray Kundargi", "email": "dharmaray@google.com", "time": "Mon Jan 17 11:40:16 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 17 11:40:16 2011 -0800" }, "message": "am 307003a8: Merge \"integrate videoeditor preview player.\" into honeycomb\n\n* commit \u0027307003a844c90458bcfd7398c44bbae734936238\u0027:\n integrate videoeditor preview player.\n" }, { "commit": "ccb3506ed1845121b94f4e27244e61a46eb19815", "tree": "28dbe58d3112cb15c9b87d94897d2aa73b1042e3", "parents": [ "6ee94582e3ce7bdd9625345e7564e3176a51a2f3" ], "author": { "name": "Dharmaray Kundargi", "email": "dharmaray@google.com", "time": "Sun Jan 16 16:43:20 2011 -0800" }, "committer": { "name": "Dharmaray Kundargi", "email": "dharmaray@google.com", "time": "Sun Jan 16 16:43:20 2011 -0800" }, "message": "integrate videoeditor preview player.\n\nChange-Id: I83084f494605c8e6f4d198afa8c36f9e29579667\n" }, { "commit": "125b7c567ab9a99b4982e31914ba2ad8b5cb3819", "tree": "12855a24a50fa5a97fbaa3f551b387940ec087de", "parents": [ "10cd7e1d15f2a347763d8b7897ffe6a4bd5e7911", "f9c1f51b261d45632625b501f44f2b2214ce3352" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Sun Jan 16 10:44:01 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Jan 16 10:44:01 2011 -0800" }, "message": "am 89a11e5d: (-s ours) am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge\n\n* commit \u002789a11e5d5c3210359679e6f211444e0d7240ae0a\u0027:\n Squash commits of the following patches, cherry-picked from other branch - do not merge.\n" }, { "commit": "10cd7e1d15f2a347763d8b7897ffe6a4bd5e7911", "tree": "12855a24a50fa5a97fbaa3f551b387940ec087de", "parents": [ "507ac2ecfe044646f361ce4b0e9034b3d1094ef1", "cc43adab338983c5b5bc8ca0658bbc2d56603f09" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Jan 16 10:42:32 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Jan 16 10:42:32 2011 -0800" }, "message": "am b3f44773: am e7df0dde: Merge \"Fixed thrashing in the cached buffer during 720p YT video streaming\" into honeycomb\n\n* commit \u0027b3f44773897588cf1ab6335444e4ca5fb0160a7f\u0027:\n Fixed thrashing in the cached buffer during 720p YT video streaming\n" }, { "commit": "f9c1f51b261d45632625b501f44f2b2214ce3352", "tree": "379120f00cb9d85b1d61238cba2b3fd0e47464a1", "parents": [ "cc43adab338983c5b5bc8ca0658bbc2d56603f09", "cf3592c5bf1c66ba510934fff5eb57ee0b3fd761" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Jan 14 21:30:16 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 14 21:30:16 2011 -0800" }, "message": "am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge\n\n* commit \u00279286cfe5017363d95798d85163ec4f28aeb0c675\u0027:\n Squash commits of the following patches, cherry-picked from other branch - do not merge.\n" }, { "commit": "cc43adab338983c5b5bc8ca0658bbc2d56603f09", "tree": "379120f00cb9d85b1d61238cba2b3fd0e47464a1", "parents": [ "6508ec903e7b6596a3b8167e3b18d0b966ea1b8f", "6ee94582e3ce7bdd9625345e7564e3176a51a2f3" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Jan 14 19:22:26 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 14 19:22:26 2011 -0800" }, "message": "am e7df0dde: Merge \"Fixed thrashing in the cached buffer during 720p YT video streaming\" into honeycomb\n\n* commit \u0027e7df0ddee486f4705b17b4d8ed57ddbeb8b71943\u0027:\n Fixed thrashing in the cached buffer during 720p YT video streaming\n" }, { "commit": "cf3592c5bf1c66ba510934fff5eb57ee0b3fd761", "tree": "db789ee0027babcee8f5a9a4b090546275365b8f", "parents": [ "3ed11317ce695a413d337c60fde222f30306f092", "95304d5488ba465f19cc788f1c7394218c2ea2d1" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Jan 14 18:33:51 2011 -0800" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Jan 14 18:33:51 2011 -0800" }, "message": "merge 83fdc69e from gingerbread - do not merge\n\nChange-Id: Ib1e9e12244a44f75a93d66142e71915de6386680\n" }, { "commit": "6ee94582e3ce7bdd9625345e7564e3176a51a2f3", "tree": "bf2c802a855fcddb53ff057e0889e11a363ee846", "parents": [ "42dd1d5f186252a7f09f8fb1a46ea82e3877b2d3" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Jan 14 15:15:12 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Jan 14 15:15:12 2011 -0800" }, "message": "Fixed thrashing in the cached buffer during 720p YT video streaming\n\nbug - 3340194\n\nChange-Id: Ic59bb18ab1731d7dd7cae7cc8aeb393900bce7f6\n" }, { "commit": "507ac2ecfe044646f361ce4b0e9034b3d1094ef1", "tree": "93fde667c67a7b62332fd0b0d678fff9f00dacf4", "parents": [ "9c2e665bc92059b2f36273ee7bf3dc9e672ec39e", "6508ec903e7b6596a3b8167e3b18d0b966ea1b8f" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Jan 13 12:40:44 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 13 12:40:44 2011 -0800" }, "message": "am c35b3268: am 1dac4cdd: am a220a297: Merge \"Initial OMA DRM forward lock contribution\"\n\n* commit \u0027c35b3268919e6201f269eb9011ae184c5f613bc3\u0027:\n Initial OMA DRM forward lock contribution\n" }, { "commit": "6508ec903e7b6596a3b8167e3b18d0b966ea1b8f", "tree": "bd1100e370bfc582f36ff046b47a9371ad8cbab7", "parents": [ "641f3f4778ed52c4225ced1eb3ee59cb3ee72a67", "3ed11317ce695a413d337c60fde222f30306f092" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Jan 13 12:38:29 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 13 12:38:29 2011 -0800" }, "message": "am 1dac4cdd: am a220a297: Merge \"Initial OMA DRM forward lock contribution\"\n\n* commit \u00271dac4cdd6faba15426a0b37a7a615c04f5a35394\u0027:\n Initial OMA DRM forward lock contribution\n" }, { "commit": "3ed11317ce695a413d337c60fde222f30306f092", "tree": "f6690821acfed0e3c10e34c0e8b1354a987122df", "parents": [ "72b228f6b18763a95023fd8ba44eb7354cfd7f74", "13e05b3f569965d97ec7d7f65e4cd46c6a22c23d" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Jan 13 11:11:51 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 13 11:11:51 2011 -0800" }, "message": "am a220a297: Merge \"Initial OMA DRM forward lock contribution\"\n\n* commit \u0027a220a2979937700024662be0f8fc166ca65506ed\u0027:\n Initial OMA DRM forward lock contribution\n" }, { "commit": "13e05b3f569965d97ec7d7f65e4cd46c6a22c23d", "tree": "27dbcb7a1f26d44723dbb123ce4c36e6cfc1b177", "parents": [ "c2322f7ac756e78de9491c17dc3c0dd14456c599", "fdd65a0fc7df2c878cc601e4c0f4021cb264f051" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Jan 13 10:51:13 2011 -0800" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu Jan 13 10:51:13 2011 -0800" }, "message": "Merge \"Initial OMA DRM forward lock contribution\"" }, { "commit": "9c2e665bc92059b2f36273ee7bf3dc9e672ec39e", "tree": "55d872d2a8d80b6d32ecd3aa72ac66e803723cc1", "parents": [ "937c34cbe5cfeb26a10ef56dd94a1108137f9e80", "641f3f4778ed52c4225ced1eb3ee59cb3ee72a67" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 13 10:29:12 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 13 10:29:12 2011 -0800" }, "message": "am 089971ea: am c14b10c3: Merge \"Add audio encoding parameters check\" into honeycomb\n\n* commit \u0027089971eaba92225aadec21d55d028df7948df012\u0027:\n Add audio encoding parameters check\n" }, { "commit": "641f3f4778ed52c4225ced1eb3ee59cb3ee72a67", "tree": "eead2fe2eb55f6681532712bea9f5232422cdfa9", "parents": [ "d19fd00c6faaf28af60115b587ff00e1c32bda66", "42dd1d5f186252a7f09f8fb1a46ea82e3877b2d3" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 13 10:24:44 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 13 10:24:44 2011 -0800" }, "message": "am c14b10c3: Merge \"Add audio encoding parameters check\" into honeycomb\n\n* commit \u0027c14b10c3068359b717b3f35b7218ce0e6dcdd08c\u0027:\n Add audio encoding parameters check\n" }, { "commit": "42dd1d5f186252a7f09f8fb1a46ea82e3877b2d3", "tree": "8169be6605d7f2cd2bc5d3e5a21b1c0ef146e176", "parents": [ "3e9eeb3b411f56d9935f9240056107816da24653" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 20:45:16 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 20:45:16 2011 -0800" }, "message": "Add audio encoding parameters check\n\nbug - 3345296\n\nChange-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65\n" }, { "commit": "937c34cbe5cfeb26a10ef56dd94a1108137f9e80", "tree": "43a10dd1809c46c1a4ddffad6a4120b018651eec", "parents": [ "09f31c14fb6d6568dd1f6a06381c7cfab688c08a", "d19fd00c6faaf28af60115b587ff00e1c32bda66" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 19:04:55 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 19:04:55 2011 -0800" }, "message": "am f97e58ef: am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.\n\n* commit \u0027f97e58efdac199906209781d04d712749f2a521d\u0027:\n Fail to parse duration instead of asserting, if the server response cannot be parsed.\n" }, { "commit": "09f31c14fb6d6568dd1f6a06381c7cfab688c08a", "tree": "43a10dd1809c46c1a4ddffad6a4120b018651eec", "parents": [ "f5ad2f9c204870a1f4dc95449774aab8d141674f", "0d75b03796a2b30cc5cf4baf5804e45219c62eac" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 19:04:50 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 19:04:50 2011 -0800" }, "message": "am 126410ed: (-s ours) am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues\n\n* commit \u0027126410ed9ec3dff26a4cf7fff41f098936d45b2a\u0027:\n DO NOT MERGE: Fix Matroska issues\n" }, { "commit": "d19fd00c6faaf28af60115b587ff00e1c32bda66", "tree": "8227d7736ee78d8901b41b462ae398ec607a1679", "parents": [ "0d75b03796a2b30cc5cf4baf5804e45219c62eac", "72b228f6b18763a95023fd8ba44eb7354cfd7f74" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 19:01:37 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 19:01:37 2011 -0800" }, "message": "am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.\n\n* commit \u0027c88b2c44117e7e3ff3deb786f7d984f4096a63de\u0027:\n Fail to parse duration instead of asserting, if the server response cannot be parsed.\n" }, { "commit": "0d75b03796a2b30cc5cf4baf5804e45219c62eac", "tree": "8227d7736ee78d8901b41b462ae398ec607a1679", "parents": [ "ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d", "4c0104e004f30d7e48381ef8d728b2e93931611f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 19:01:17 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 19:01:17 2011 -0800" }, "message": "am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues\n\n* commit \u00270ef0d76a9d5477942d5586933d35d299671fadc5\u0027:\n DO NOT MERGE: Fix Matroska issues\n" }, { "commit": "f5ad2f9c204870a1f4dc95449774aab8d141674f", "tree": "43a10dd1809c46c1a4ddffad6a4120b018651eec", "parents": [ "ebccf76cebe40667f9fc6d1317a6ae010dc82735", "ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d" ], "author": { "name": "repo sync", "email": "andih@google.com", "time": "Wed Jan 12 18:03:26 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 18:03:26 2011 -0800" }, "message": "am b2d782d0: (-s ours) am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp\n\n* commit \u0027b2d782d084fd8859ccd582ebd6bc38d947370b99\u0027:\n DO NOT MERGE: Fix parsing of ntp\u003d PLAY response.\n" }, { "commit": "ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d", "tree": "8227d7736ee78d8901b41b462ae398ec607a1679", "parents": [ "cf97dff7e5d6ed4d80be0f468a43c2360836d439", "960737e761895d5850beabab809d03b3621d0ec3" ], "author": { "name": "repo sync", "email": "andih@google.com", "time": "Wed Jan 12 17:58:48 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 17:58:48 2011 -0800" }, "message": "am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp\n\n* commit \u0027d439ac396ecb9e909c543424211d563325fea72b\u0027:\n DO NOT MERGE: Fix parsing of ntp\u003d PLAY response.\n" }, { "commit": "95304d5488ba465f19cc788f1c7394218c2ea2d1", "tree": "5f5269238a292e0e747cbfa2a01e6a2fb24615b8", "parents": [ "e49051406baa71cb63d5754d33908ce3df201af1" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Dec 02 17:42:08 2010 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 17:12:46 2011 -0800" }, "message": "Squash commits of the following patches, cherry-picked from other branch - do not merge.\n\no Prepare for publishing MediaMetadataRetriever as public API\n step one:\n o replaced captureFrame with getFrameAtTime\n o removed getMode\n\no Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()\n as part of the preparation for publishing MediaMetadataRetriever as public Java API\n\no Remove captureFrame from MediaMetadataRetriever.java class\n It has been replaced by getFrameAtTime() method\n\no Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java\n\no Publish MediaMetadataRetriever.java as public API\n o Removed setMode() methods and related mode constants\n o Removed some of the unused the metadata keys\n o Updated the javadoc\n o part of a multi-project change.\n\nbug - 3309041\n\nChange-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4\n" }, { "commit": "ebccf76cebe40667f9fc6d1317a6ae010dc82735", "tree": "43a10dd1809c46c1a4ddffad6a4120b018651eec", "parents": [ "8647e1ad4dbd9a7398d5ccbefeb9810c70524dbc", "cf97dff7e5d6ed4d80be0f468a43c2360836d439" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 15:35:17 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 15:35:17 2011 -0800" }, "message": "am 4fbf60e7: (-s ours) am 0569e589: (-s ours) am 13d1cb56: Merge \"Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\" into gingerbread\n\n* commit \u00274fbf60e724ec6aff3ec8d78a5fdb284e98c914cb\u0027:\n Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\n" }, { "commit": "cf97dff7e5d6ed4d80be0f468a43c2360836d439", "tree": "8227d7736ee78d8901b41b462ae398ec607a1679", "parents": [ "20df25aae1a065d3671d8d6d9d5d81836054de7b", "7b8a803497450bb90b9c4f5ba3426bf984fad274" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 15:31:01 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 15:31:01 2011 -0800" }, "message": "am 0569e589: (-s ours) am 13d1cb56: Merge \"Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\" into gingerbread\n\n* commit \u00270569e58988bae5f08733e21e8d8adfa61fe89b7f\u0027:\n Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\n" }, { "commit": "8647e1ad4dbd9a7398d5ccbefeb9810c70524dbc", "tree": "43a10dd1809c46c1a4ddffad6a4120b018651eec", "parents": [ "9ec785a3f739fcabebb5ae71d9b45b07b32a1095", "20df25aae1a065d3671d8d6d9d5d81836054de7b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 14:38:17 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 14:38:17 2011 -0800" }, "message": "am 156a3c9b: am 7928ca6f: Merge \"Fail to parse duration instead of asserting, if the server response cannot be parsed.\" into honeycomb\n\n* commit \u0027156a3c9ba702f3159e0b4a76c65606b5f97b276c\u0027:\n Fail to parse duration instead of asserting, if the server response cannot be parsed.\n" }, { "commit": "9ec785a3f739fcabebb5ae71d9b45b07b32a1095", "tree": "6ee365879abf89c58f633bfc7044febce3f2b596", "parents": [ "c530f8268420fa4da0de03686559978510f2670a", "3cb13098df7b0c2aaae7b18f1518b02447f3b8c0" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 14:38:12 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 14:38:12 2011 -0800" }, "message": "am 999fb5a5: am 068b41d5: Merge \"Publish MediaMetadataRetriever.java as public API\" into honeycomb\n\n* commit \u0027999fb5a5a952ffb0c13ee5d6940fa1a39f165bcd\u0027:\n Publish MediaMetadataRetriever.java as public API\n" }, { "commit": "20df25aae1a065d3671d8d6d9d5d81836054de7b", "tree": "8227d7736ee78d8901b41b462ae398ec607a1679", "parents": [ "3cb13098df7b0c2aaae7b18f1518b02447f3b8c0", "3e9eeb3b411f56d9935f9240056107816da24653" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 14:35:46 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 14:35:46 2011 -0800" }, "message": "am 7928ca6f: Merge \"Fail to parse duration instead of asserting, if the server response cannot be parsed.\" into honeycomb\n\n* commit \u00277928ca6f87af4b70086ecf75383ba43da37da891\u0027:\n Fail to parse duration instead of asserting, if the server response cannot be parsed.\n" }, { "commit": "3cb13098df7b0c2aaae7b18f1518b02447f3b8c0", "tree": "1bae54c308898f7ebb3b577706f5ba3654c2cf86", "parents": [ "367bb55aaf022b7f727478cbd3b50866a9e537f4", "7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 14:35:35 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 14:35:35 2011 -0800" }, "message": "am 068b41d5: Merge \"Publish MediaMetadataRetriever.java as public API\" into honeycomb\n\n* commit \u0027068b41d5d41a4a78c96586b85ea89d464d302548\u0027:\n Publish MediaMetadataRetriever.java as public API\n" }, { "commit": "3e9eeb3b411f56d9935f9240056107816da24653", "tree": "cfaad6e7a887102b85359705a8f0d3267bb6fb71", "parents": [ "7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e", "934ca8cb1bcffcf1781a576ca625d2f901e5f0a9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 14:33:51 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 12 14:33:51 2011 -0800" }, "message": "Merge \"Fail to parse duration instead of asserting, if the server response cannot be parsed.\" into honeycomb" }, { "commit": "7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e", "tree": "5e17f415d44cdba3c8b37a42c487e28e26593a64", "parents": [ "67988a9ba5a081d14dbd8a663516e1d484d829df" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Jan 06 12:20:35 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 14:14:11 2011 -0800" }, "message": "Publish MediaMetadataRetriever.java as public API\n\no Removed setMode() methods and related mode constants\no Removed some of the unused the metadata keys\no Updated the javadoc\n\no part of a multi-project change.\n\nbug - 2433195\n\nChange-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438\n" }, { "commit": "c530f8268420fa4da0de03686559978510f2670a", "tree": "26ec7e5584c1514a6f55bcb19fae62336300ff6d", "parents": [ "bc0d4482a6d23f3373d02f9027a1af017a6d7749", "367bb55aaf022b7f727478cbd3b50866a9e537f4" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 11:57:54 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 11:57:54 2011 -0800" }, "message": "am 5df82ef9: am cb0f6d0b: Merge \"Speed up MP3Extractor using cached reads\" into honeycomb\n\n* commit \u00275df82ef953a4b0f29ab4690b838a7b269b1b4ab1\u0027:\n Speed up MP3Extractor using cached reads\n" } ], "next": "367bb55aaf022b7f727478cbd3b50866a9e537f4" }