)]}' { "log": [ { "commit": "d01d261183a4b832c2575ae0d82f68125605b21e", "tree": "0dceeaedcf550341c556dbf2a6b015dba824d39a", "parents": [ "8077b4feba20505e329ba907feb5e8a456d7d150", "a54a06b3f0533f7287456ab35c4d88049156d91e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 01 13:55:41 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 01 13:55:41 2011 -0800" }, "message": "Merge \"Add README for media \"automated\" tests\"" }, { "commit": "a54a06b3f0533f7287456ab35c4d88049156d91e", "tree": "42e2280d27b01ab8e13fe9902ed9b54d6c1e156d", "parents": [ "d2a28b3ee07e27cc374d07b02995fb865474aae7" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 01 13:35:32 2011 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 01 13:35:32 2011 -0800" }, "message": "Add README for media \"automated\" tests\n\nChange-Id: I92e611fb6df2d870ded9e246963277ecc35b0d15\n" }, { "commit": "f8ebb32d1fa8fc521f47d83ffa77e20ded066c45", "tree": "50b87e59a11c1df4a59fec70a749ffcb27cd019a", "parents": [ "89b262990fc82b1b928519744b1640ead406f110", "10526a0bfe070ac4d1e550a81ed68be35d261b16" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:22:19 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 01 10:22:19 2011 -0800" }, "message": "am 10526a0b: am 2c2ed7be: Merge \"Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\" into ics-mr1\n\n* commit \u002710526a0bfe070ac4d1e550a81ed68be35d261b16\u0027:\n Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n" }, { "commit": "1fc2e60d59abfe1c4d7f9611c685c894ad1a383f", "tree": "defea6ddc1b9ede4f1c2de36b119cd04ab25cd8c", "parents": [ "90ea4c4d30ccafb51e024ab3c34a4655d06eec4c" ], "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": "df96385b9acf9ec74c62edc34ffa9c8d9dae1c03", "tree": "156e5102fa53ad3debbe864bc1780925d693fa71", "parents": [ "267a4b0627f98b020725e860b0a3c128067131b1", "c040e1e77923d81050f2d3dbdac5d07e01be72f6" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Wed Nov 30 10:50:49 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 30 10:50:49 2011 -0800" }, "message": "am c040e1e7: am 6f1dd757: Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1\n\n* commit \u0027c040e1e77923d81050f2d3dbdac5d07e01be72f6\u0027:\n SurfaceMediaSource: use the vid enc usage bit\n" }, { "commit": "db85b54395c2866f07178558079cbc1813ff420c", "tree": "e97ace34340c2d586eeb5d8672609de4bc170bc1", "parents": [ "7a44d68249d64585c55ad7525ff2271f853850ac", "3d630e867d63edfb1e941859108f635c1995b76e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 30 09:53:40 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 30 09:53:40 2011 -0800" }, "message": "resolved conflicts for merge of 3d630e86 to master\n\nChange-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e\n" }, { "commit": "44ddd1ff887395d747ded17f1f6b52f059320fcd", "tree": "b5c1f2300d9657ebd9794bad44e497a4cc77a053", "parents": [ "e7b3e09a5ed21dab938a7efdc215bb20d2769702" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 29 17:59:29 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 29 18:00:03 2011 -0800" }, "message": "Fix the broken build\n\nChange-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f\n" }, { "commit": "6f1dd757cb158d17c76baeb170f7db2271802ef8", "tree": "e965c66766e6d362eca7e7b4474107740874dc7f", "parents": [ "f296ee697409b4b55bef17d534edbc24a4619f0f", "6deb4b538ecf5cbd4418492bfb6b79df67eedfb7" ], "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": "e7b3e09a5ed21dab938a7efdc215bb20d2769702", "tree": "8eb7926dfeac4f205e501e55b25ea30f2cfc38d2", "parents": [ "848bffd8fa07f0e16d0ac5eed95085288ff43d9f", "52607c5364446df6ac5b2f55cb50e146e6023a4f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 16:33:04 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 16:33:04 2011 -0800" }, "message": "am 52607c53: am d12dc284: Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1\n\n* commit \u002752607c5364446df6ac5b2f55cb50e146e6023a4f\u0027:\n If an error occurs that prevents us from reallocating buffers during a format change\n" }, { "commit": "848bffd8fa07f0e16d0ac5eed95085288ff43d9f", "tree": "b7ef7703f0a0b33df7d6a263c8cb3bfb5c371d9b", "parents": [ "baeda5135bb1b4a87334c41834f3532ab73a4022", "074133b260f8d12e484e93b9aa5a33a4983b7349" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 16:33:02 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 16:33:02 2011 -0800" }, "message": "am 074133b2: am 351143fb: Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1\n\n* commit \u0027074133b260f8d12e484e93b9aa5a33a4983b7349\u0027:\n Updated (internal) API for IStreamSource to signal discontinuities\n" }, { "commit": "a3f887bd30bb5f79751f52c13e68f75b8195ccf1", "tree": "1f8bd55d70535474fbd1c5b65c483e2c9283c1ea", "parents": [ "b7a4db0a53cff6162d6981f9657a2ac70925ad73", "998a929ababe60b6e4d2f823ba63897a39322fd4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 15:14:44 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 15:14:44 2011 -0800" }, "message": "resolved conflicts for merge of 998a929a to master\n\nChange-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8\n" }, { "commit": "564fee36667e2699c59a29102136220dc2f65862", "tree": "94999b9598b150f31723238b513a928eb5672a35", "parents": [ "d12dc28460f622ab29e83fa688ad83a8263e9417", "551aeac336b426ae962e232d5223e7b994aaf1e1" ], "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": "d12dc28460f622ab29e83fa688ad83a8263e9417", "tree": "47fa98e5e289300bbb65f48af427b4d6d68fa54b", "parents": [ "351143fb0e2fcfb7dc2ef1045d693c71eb0ea329", "d03e7d62d5a5eda07e19b0bbc1eaa6ed82d860c5" ], "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": "351143fb0e2fcfb7dc2ef1045d693c71eb0ea329", "tree": "e62eb07e221bd3d64ecaffbcbe5483dc89d1df6b", "parents": [ "405a4e34032f8a07028138266fe9f79f6753b466", "a10613fea8e9d8a73385d37ad92f9c56d8828ce6" ], "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": "405a4e34032f8a07028138266fe9f79f6753b466", "tree": "62352e960b6fe93d856304089387041104d706ac", "parents": [ "be6ab576ff0e3bf2a8dc3feee6f476061afbda30", "66a051af37c3d7a610802c0c58906dc0faefa6be" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:08:13 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:08:13 2011 -0800" }, "message": "Merge \"Finer granularity discontinuity support.\" into ics-mr1" }, { "commit": "a10613fea8e9d8a73385d37ad92f9c56d8828ce6", "tree": "5be4f71fbf79a2f5e1131d63b53a647ecc072f15", "parents": [ "fed7a99a5294856d930e18225898828bd6755be1" ], "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": "aa2892edc7bb2b915771679d9811ec54a26db366", "tree": "49c0dc6ac659e69b4a2b7c4c439d60b7d759e3e6", "parents": [ "1e773932a1658128b80508f081de3c80655465d2", "f3918c5bd4bc9f02f74da42995564150ca2dd382" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Nov 29 11:47:03 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 11:47:03 2011 -0800" }, "message": "Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8\n\n* changes:\n Add support for sending VSYNC events to the framework\n BitTube::read now handles EAGAIN\n split ComposerService out of SurfaceComposerClient.h\n rewrite SF\u0027s message loop on top of Looper\n" }, { "commit": "9a8246c8d1ea324b6704bf4fe0b77ade1c2f3639", "tree": "7870060b4752aa7750dd5b8e05be0ec023a0b764", "parents": [ "2f9e260185e9c83800ba14fdc7abeb95a399f526", "77d1ebbd7bd42d849911e680a63eec02e8b444db" ], "author": { "name": "Yu Shan Emily Lau", "email": "yslau@google.com", "time": "Mon Nov 28 19:57:26 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 28 19:57:26 2011 -0800" }, "message": "am 77d1ebbd: am 4e5d3f2c: Merge \"Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.\" into ics-mr1\n\n* commit \u002777d1ebbd7bd42d849911e680a63eec02e8b444db\u0027:\n Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.\n" }, { "commit": "99b4523b753f35122e23e90c95f57399c3f8bb10", "tree": "7118f56a7208ee8d849cfa1ade8873be8227dfa0", "parents": [ "37ac88f994c5b8af291acd9c8d7eb5e22ce3c489" ], "author": { "name": "Yu Shan Emily Lau", "email": "yslau@google.com", "time": "Wed Nov 23 19:02:01 2011 -0800" }, "committer": { "name": "Yu Shan Emily Lau", "email": "yslau@google.com", "time": "Mon Nov 28 17:56:02 2011 -0800" }, "message": "Add the min fps option to set\nthe min fps in the media recorder test.\nAdd the procmem log to the media\nmemory stress test.\n\nChange-Id: Icf82f12adeca7072a171991d1d6a994e4bb7764a\n" }, { "commit": "66a051af37c3d7a610802c0c58906dc0faefa6be", "tree": "239db41f3a82a16f603dbeebef3da869b1d966bc", "parents": [ "e35581ad5ad635f9dcfe4ab6a432c48b46b782cd" ], "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": "551aeac336b426ae962e232d5223e7b994aaf1e1", "tree": "531855a6ed7be8612dfbf95dcca71d6088434acf", "parents": [ "e35581ad5ad635f9dcfe4ab6a432c48b46b782cd" ], "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": "3f15700a012b1ab0097eaf90caf0540ba6caa529", "tree": "548cf135dc366cfd34e430024e89b8e0b58a35b4", "parents": [ "16aca5197244f9066968658735611a0dbbe46403" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Nov 17 17:48:35 2011 -0800" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Nov 28 15:21:57 2011 -0800" }, "message": "split ComposerService out of SurfaceComposerClient.h\n\nChange-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6\n" }, { "commit": "d03e7d62d5a5eda07e19b0bbc1eaa6ed82d860c5", "tree": "e64d854927bfab0c6c1982002a2a071004d5aaf6", "parents": [ "e35581ad5ad635f9dcfe4ab6a432c48b46b782cd" ], "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": "f53453d59615e3709e683215ea4ddaf6daf9bc91", "tree": "18153af312d67e5c25363d899fac6ddf3ae37495", "parents": [ "b1e72b6826455a19a80dab14612da7f22e0e1a75", "7e6265e0d216e0b872a5f103af1c7bb022ade06e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 22 17:36:45 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 22 17:36:45 2011 -0800" }, "message": "Merge \"Fix a subtitle bug: multiple blank lines in SubRip(srt) file.\"" }, { "commit": "55cadf7eca8dffa981054d3521fd279fefe9b6f4", "tree": "739dc96c2d52f6050b056e8b64765b72f3983b1a", "parents": [ "ec24b0217e6e6de9ebcfb72154dbde2070f53e5a", "4d592c59e684ed3e6f0db4b05c37ba8774b8d410" ], "author": { "name": "dujin.cha", "email": "dujin.cha@samsung.com", "time": "Tue Nov 22 13:22:00 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 22 13:22:00 2011 -0800" }, "message": "am 4d592c59: am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue\n\n* commit \u00274d592c59e684ed3e6f0db4b05c37ba8774b8d410\u0027:\n [Prime K] Fix gabage character issue\n" }, { "commit": "eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0", "tree": "61c6212cb0987cd45b47d3ed10bd5d6601ec8ee5", "parents": [ "eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f", "fe464a76d8fc858be971dbb5e67b1d22fd925347" ], "author": { "name": "dujin.cha", "email": "dujin.cha@samsung.com", "time": "Tue Nov 22 13:18:27 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 22 13:18:27 2011 -0800" }, "message": "am fe464a76: [Prime K] Fix gabage character issue\n\n* commit \u0027fe464a76d8fc858be971dbb5e67b1d22fd925347\u0027:\n [Prime K] Fix gabage character issue\n" }, { "commit": "fe464a76d8fc858be971dbb5e67b1d22fd925347", "tree": "5fae81310242c8fc3dd782d3ee5e858d2e67784a", "parents": [ "e36657e5416dbc9c1b22cc73174a958fafdfd736" ], "author": { "name": "dujin.cha", "email": "dujin.cha@samsung.com", "time": "Tue Nov 22 12:13:33 2011 +0900" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Nov 22 10:28:21 2011 -0800" }, "message": "[Prime K] Fix gabage character issue\n\nKorean characters show up as gabage characters in Music player.\nReason : MTP service does not set the locale for the MediaScanner\nSolution : Set locale when MtpDatabase creates MediaScanner.\n\nBug ID : 5567433\nSigned-off-by: dujin.cha \u003cdujin.cha@samsung.com\u003e\n\nChange-Id: I4bfe5f603c113170d45bd57a8709c21c665e260b\n" }, { "commit": "72a845d53900048c13edf4a4ac33386f3332e838", "tree": "9b324d488f64d3989ed2fda81df376a9ed7b2f5e", "parents": [ "5b17f73573e778c3ac22e41d13d4633f1f1d3f9f", "31626b3075335f4cf579342e99436bb45870cf55" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 22 08:43:28 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 22 08:43:28 2011 -0800" }, "message": "am 31626b30: am cb6fbc89: Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1\n\n* commit \u002731626b3075335f4cf579342e99436bb45870cf55\u0027:\n Report a runtime error instead of asserting on malformed avc configuration data.\n" }, { "commit": "cb6fbc89c25298643ab342b4a228e772b0e56978", "tree": "66e96e1e6c7aa64d5bb6a84e10b46213fbf296a0", "parents": [ "631885746868cbf03f89e655a6f4fac96449e8a4", "0ba8660ea6d88a1809508c31bd3b1da8e8dfabd3" ], "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": "7e6265e0d216e0b872a5f103af1c7bb022ade06e", "tree": "52895b6f393685263d0be5fd45f9995f3a81de70", "parents": [ "07679d191e9ae03b8ad78020968a79ad89e6cde0" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Tue Nov 22 20:59:31 2011 +0900" }, "committer": { "name": "Insun Kang", "email": "insun@google.com", "time": "Tue Nov 22 21:11:49 2011 +0900" }, "message": "Fix a subtitle bug: multiple blank lines in SubRip(srt) file.\n\nTimedTextParser should handle multiple blank lines between subtitles\nin SRT format.\n\nChange-Id: Id81e0a14d9984141f68b9f0919942c85562301b3\n" }, { "commit": "4e2ecdd8a78f25f4c234877d5321ebd4e4c0e8f7", "tree": "fc7fc0c14ceeb9811298b19197bc9c132a78883a", "parents": [ "24692d6c9e35e99ec77f5fb57c53bfeef30315a1", "d0a254566f5f0be5607b4d64839a575c888c94f6" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 21 21:08:55 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 21 21:08:55 2011 -0800" }, "message": "am d0a25456: am 02740dc4: Merge \"Fix log spamming during time lapse video recording\" into ics-mr1\n\n* commit \u0027d0a254566f5f0be5607b4d64839a575c888c94f6\u0027:\n Fix log spamming during time lapse video recording\n" }, { "commit": "6deb4b538ecf5cbd4418492bfb6b79df67eedfb7", "tree": "c7a3bb6bdbe11d49b220c53b4d1eed518b29d560", "parents": [ "b8d20d028ca590f6a9c57e0e8fee5e5f80e9ae54" ], "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": "96af14d9b013496accf40a85a66fefcba3ac0111", "tree": "0d77b5fc0a82fc4b82bb1b1df83a92473cc0fb69", "parents": [ "7859c1842c1f2e3c43415dfb5337a0b005bdb1c4" ], "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": "7ff7821a601a39fffb318e29873957b4a3703c46", "tree": "1e3cbf41ef8ef551d73c5f303739a126301c6f9f", "parents": [ "d8a3cabcb11c02c54b76590e0f60c32b43b9f2fc", "d4b22ab4889f9b1885bfc0dc45667c846a171a98" ], "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": "d4b22ab4889f9b1885bfc0dc45667c846a171a98", "tree": "4fa2350acd3bdc0d6cf1bca1740e7cf4c142050b", "parents": [ "366113fa1bea5ef39cf6557f18ff00310eb6e458" ], "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" }, { "commit": "1cad15207df78babcd5871effa63604f78f597ac", "tree": "bcc6a25ab35c333b4ae5ee65e74caae2e56c07c4", "parents": [ "33d4dde0580176c23f0773f8e18f99ba1111b023" ], "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 13:10:56 2011 -0800" }, "message": "status_t !\u003d bool\n\nb/5567433\n\nChange-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e\n" }, { "commit": "0ba8660ea6d88a1809508c31bd3b1da8e8dfabd3", "tree": "9e7a57f403f0bbe83e7c785b814cb03bc016c009", "parents": [ "dea90a0e1c9c1d15657024893b6793dc21bc27ef" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 18 12:22:59 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 18 12:22:59 2011 -0800" }, "message": "Report a runtime error instead of asserting on malformed avc configuration data.\n\nChange-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845\nrelated-to-bug: 5641069\n" }, { "commit": "aa25761114b143ed3182d97004ec1366c2ae850e", "tree": "60f713214ef7835ae2815115e017d83b50c2b001", "parents": [ "a93a7d6d15295e36b54b928bc57f0b5ca239714a", "624efe45671131903fb5165f6133ba39486092ab" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 17 13:20:16 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 13:20:16 2011 -0800" }, "message": "am 624efe45: am c1b1709b: Merge \"Make sure not to cancel pending seek/EOS notifications on a cache underrun...\" into ics-mr1\n\n* commit \u0027624efe45671131903fb5165f6133ba39486092ab\u0027:\n Make sure not to cancel pending seek/EOS notifications on a cache underrun...\n" }, { "commit": "7418e385f4523b94662d3fef614dac26d8a36885", "tree": "b6981d801614f1a93f9858f3fd044365aa2e6797", "parents": [ "b447e9ce1d3dc603a8879340f36a4ca4f22d6b62", "376c393039451e572ce60e0da933fbd70ae12a4a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Nov 17 07:14:41 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 17 07:14:41 2011 -0800" }, "message": "Merge \"MidiFile uses C++ Thread not createThreadEtc\"" }, { "commit": "b447e9ce1d3dc603a8879340f36a4ca4f22d6b62", "tree": "0d9f68cf4a74e2602a74f38f7b2b66fd27350ad9", "parents": [ "77c5f4def49357a89abd9849b0bab950179d71f4", "9c0227a63c9903cf407da4a713ff619e49c6bc73" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Nov 17 07:14:29 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 17 07:14:29 2011 -0800" }, "message": "Merge \"JetPlayer uses C++ Thread not createThreadEtc\"" }, { "commit": "376c393039451e572ce60e0da933fbd70ae12a4a", "tree": "0391bca7457d8bc0b5440231affcb816b5c6170b", "parents": [ "5a4718183340a108b55eba7bf755b4432153caa1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jun 23 17:11:35 2011 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 16 15:43:31 2011 -0800" }, "message": "MidiFile uses C++ Thread not createThreadEtc\n\nThis permits leveraging future improvements to Thread.\n\nChange-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56\n" }, { "commit": "9c0227a63c9903cf407da4a713ff619e49c6bc73", "tree": "fa4abf755c8d500a684879a00ddfa3f38a341075", "parents": [ "5a4718183340a108b55eba7bf755b4432153caa1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jun 23 16:43:24 2011 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 16 15:25:30 2011 -0800" }, "message": "JetPlayer uses C++ Thread not createThreadEtc\n\nThis permits leveraging future improvements to Thread.\n\nChange-Id: I60deed8565ed54f13d9f770c76504e411b154276\n" }, { "commit": "99d544332a6e79d9f4fa6d981f95e8ba6c037ab7", "tree": "ca499ce5649c307ed0c7f931c74adf0d6bdab68d", "parents": [ "5a4718183340a108b55eba7bf755b4432153caa1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Jun 22 16:15:25 2011 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 16 14:52:55 2011 -0800" }, "message": "Bug 4903178 Restore priority and cgroup on stop\n\nOn AudioTrack and AudioRecord stop or failed start, restore the priority\nand cgroup of the caller to their previous values, rather than forcing\nto NORMAL. Dependent on new thread APIs.\n\nAlso fixes bug where priority was set to AUDIO but cgroup not set.\n\nChange-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8\n" }, { "commit": "22cf4b0c5f76c9bcf9103af21b29c9b532ea52c2", "tree": "16f49a7e3488e3b55b86e84f826116bcde729669", "parents": [ "c7403258528a08ab74f7c29277d0c34ba6edc53d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 16 10:46:05 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 16 10:46:05 2011 -0800" }, "message": "Make sure not to cancel pending seek/EOS notifications on a cache underrun...\n\nor they are lost for good.\n\nChange-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62\nrelated-to-bug: 5544907\n" }, { "commit": "0e7d85fa93a5f5975b437277439b3c65f86cf275", "tree": "9583c9f67deea73d392e692331da2650a381dd38", "parents": [ "ca127baa0675bc1168019fbb1f9812dbbe4613d7", "4e72e2bfc24afe053ca98c6de2591a4057cfd9fa" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 15 20:19:55 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 15 20:19:55 2011 -0800" }, "message": "am 4e72e2bf: am 4fdc36e6: Merge \"Document that release() should be called with onPause() and onStop() for media objects\" into ics-mr1\n\n* commit \u00274e72e2bfc24afe053ca98c6de2591a4057cfd9fa\u0027:\n Document that release() should be called with onPause() and onStop() for media objects\n" }, { "commit": "4fdc36e6d6003cdce911678f0b233697554f8dbf", "tree": "5071202f980d8e18e80f00d2987facb075b416a6", "parents": [ "45f05c9580739ffe2d665cec50efb0bb57d757ba", "89ca6983eb2be21848f5ac884a2c118f152c83e6" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 15 20:13:03 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 15 20:13:03 2011 -0800" }, "message": "Merge \"Document that release() should be called with onPause() and onStop() for media objects\" into ics-mr1" }, { "commit": "29270da5f7dee7e81b9d69446c7d2030aea6ff74", "tree": "ff0b4b61184e438fdbfac5139e50160469664fe1", "parents": [ "dff37bc674310beeb2aaf296130b8bbaa0e2ead2", "4978c1a5b07782d622ca9e3eedd649a5927d226f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Nov 15 18:28:39 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 15 18:28:39 2011 -0800" }, "message": "am 4978c1a5: am 0ddb0143: Merge \"Fix 5623252 unlink to death of audio focus client early\" into ics-mr1\n\n* commit \u00274978c1a5b07782d622ca9e3eedd649a5927d226f\u0027:\n Fix 5623252 unlink to death of audio focus client early\n" }, { "commit": "89ca6983eb2be21848f5ac884a2c118f152c83e6", "tree": "3d270f87edbba1a0ee42a63364b61a5f22bcc768", "parents": [ "b3b66af2b5b4ccca1f507290ab6f138a3cbffc3e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 14 19:01:26 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 15 18:08:06 2011 -0800" }, "message": "Document that release() should be called with onPause() and onStop() for media objects\n\nChange-Id: I12dd734b4314df4f0573ad56a1714348e50da05e\nrelated-to-bug: 5616833\n" }, { "commit": "e7edc868538e83152e7bc35c830fee0d629baefc", "tree": "10b740a8dd1b3d18ce353da65faea9feb940e5be", "parents": [ "34a62348be92034a9fb7582e51754224785568dc" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Nov 15 16:27:05 2011 -0800" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Nov 15 17:41:05 2011 -0800" }, "message": "Fix 5623252 unlink to death of audio focus client early\n\nWhen removing an entry in the audio focus stack, don\u0027t wait for\n this object\u0027s finalizer to unlink to the death of the associated\n client, and unlink right away.\nThe FocusStackEntry.unlinkToDeath() method is made safe to call\n by catching the exception it can throw inside its body.\n\nChange-Id: Id347a933d72dcb41531adff2854fb00277032cc9\n" }, { "commit": "cc6c20f5321e39ee75172f329450dd60a69c980f", "tree": "c7c3ca11811eb608a786120a3a00dbb9362f8257", "parents": [ "0e02e42140d54410ec90e21e90af23cc8b4da31d", "716747f7cb29b45e41c2870f12d39095f4ed80c8" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Nov 15 13:07:07 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 15 13:07:07 2011 -0800" }, "message": "am 716747f7: am 481ffa50: Merge \"Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\" into ics-mr1\n\n* commit \u0027716747f7cb29b45e41c2870f12d39095f4ed80c8\u0027:\n Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\n" }, { "commit": "eb80b31b5548650675c078ccfffc3091402a9382", "tree": "91395268faadfcb0a488ccca5db68fbd943294b2", "parents": [ "7c4dee75b8a9db10ff1c5456ea7d13bfc61f35ab", "87597d9ce00691f05703f728c17548df2bbc9cc2" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Nov 15 13:06:57 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 15 13:06:57 2011 -0800" }, "message": "am 87597d9c: am 538dc6ac: Merge \"Fix 5615747 Don\\\u0027t leak remote control client death handlers\" into ics-mr1\n\n* commit \u002787597d9ce00691f05703f728c17548df2bbc9cc2\u0027:\n Fix 5615747 Don\u0027t leak remote control client death handlers\n" }, { "commit": "481ffa505bb1d8f5089ea98e3b5960d409b6819c", "tree": "e27a4ae290b172cb6afc4d7559e32994e810762d", "parents": [ "ce33622aed7fb25a14ef957cdc78b78cc4602be9", "7eb531970305f938c8e3bdc564bed6156fbd8f06" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Nov 15 09:42:37 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 15 09:42:37 2011 -0800" }, "message": "Merge \"Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\" into ics-mr1" }, { "commit": "a9509736c85c19fe4ad4ba97a0545f0422a3dfc1", "tree": "b92044586a0fdb62deb6d006b29c844130410fb9", "parents": [ "258576a82c2293c3a988bf2dc6744fd8082421f9" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Nov 14 15:23:04 2011 -0800" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Nov 14 17:30:23 2011 -0800" }, "message": "Fix 5615747 Don\u0027t leak remote control client death handlers\n\nWhenever a remote control stack entry is GC\u0027d or removed from\n the stack, unlink its death handler.\n\nChange-Id: Ia4ed6667351849fd388272591e24ffc16959beaf\n" }, { "commit": "f1ec32db686586eddd023583e1c5978005c06d58", "tree": "e539f119e3f2031d42cecd584a1e591bf94d882b", "parents": [ "28a5ec9613a824d2ec15ce5e5cec77a6fcf444d5", "9d36a99582518ed1a7fb005382e0128479b43e18" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Nov 14 14:38:30 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 14 14:38:30 2011 -0800" }, "message": "am 9d36a995: am 258576a8: Merge \"Fix 5607938 AudioFocusDeathHandler leaks GREF\" into ics-mr1\n\n* commit \u00279d36a99582518ed1a7fb005382e0128479b43e18\u0027:\n Fix 5607938 AudioFocusDeathHandler leaks GREF\n" }, { "commit": "7eb531970305f938c8e3bdc564bed6156fbd8f06", "tree": "afc50650e68ed32d453950ec32eff0904e969945", "parents": [ "88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Thu Nov 10 14:54:26 2011 -0800" }, "committer": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Mon Nov 14 13:02:59 2011 -0800" }, "message": "Fix for issue 5309336\n-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\n\nChange-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509\n" }, { "commit": "527c44e8a455dd0fdef1aeb6d7d8f99bb0839295", "tree": "118f8d3b784b29fc519957bba613d4339b04af36", "parents": [ "b14d771cf07479e3186a167a219fb2d42d8d4d30", "62b9aec7a0a4e1cf8cfec7e39ea3103ab510d72e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Nov 14 10:50:33 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 14 10:50:33 2011 -0800" }, "message": "Merge \"Don\u0027t check return value of new for being \u003d\u003d null\"" }, { "commit": "de1f065be109e1c313d8330c8e34210fedaac74e", "tree": "ba350f88aa1c75fd400552b5ca8afa0c8e26f9e2", "parents": [ "24597eb77e1a88994b83c5b1f45d5b72383943b8" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Nov 11 16:13:48 2011 -0800" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Nov 11 16:13:48 2011 -0800" }, "message": "Fix 5607938 AudioFocusDeathHandler leaks GREF\n\nThe AudioFocus death handler was correctly updating the audio\n focus stack when an audio focus client dies, but the death handler\n was leaking GREF if unlinkToDeath() is not called.\nThe fix consists in making sure unlinkToDeath() is always called\n by calling it in its finalizer.\n\nChange-Id: I0c5343b4986ab582cadbf171fc53816952dc16f5\n" }, { "commit": "c512fd065c2bb4f5d39bb13f45d3fb32370f6880", "tree": "a7d1c97fc91c7f4ed8c06ffb49608697c9482964", "parents": [ "3dc44d9afe72fc1975dcf7d8b883fc101047b2be", "9a176507a96ceb3640a56a5449e96fc3e406a765" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Nov 11 11:51:19 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:51:19 2011 -0800" }, "message": "am 9a176507: am b7a000a6: Merge \"Unhide the key to retriever location information in 3gp/mp4 files\" into ics-mr1\n\n* commit \u00279a176507a96ceb3640a56a5449e96fc3e406a765\u0027:\n Unhide the key to retriever location information in 3gp/mp4 files\n" }, { "commit": "3dc44d9afe72fc1975dcf7d8b883fc101047b2be", "tree": "17e232c1765e1d1efcd7ecb5cb956fe45445e5c0", "parents": [ "41904b1e58c6faa4bc36e6dd2ab1b8c7e9bd1130", "8a0654231ff36d938bc3451190cf67231195f1d0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 11:51:17 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:51:17 2011 -0800" }, "message": "am 8a065423: am 23217182: Merge \"Didn\\\u0027t mean to check this in...\" into ics-mr1\n\n* commit \u00278a0654231ff36d938bc3451190cf67231195f1d0\u0027:\n Didn\u0027t mean to check this in...\n" }, { "commit": "ff1fa5ef933a7e3c5e00f39b196fc6d480e5c27d", "tree": "8c848d10474973b3ad64236616d8fee741221c42", "parents": [ "d8ad2fab90b4f6eb50ba9c45e140811bad848384", "2c29a5cf1658532bca4e34f816fa30312241a336" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 11 11:51:14 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:51:14 2011 -0800" }, "message": "am 2c29a5cf: am 1f8c6212: Merge \"visualizer: reset buffer if playback is idle\" into ics-mr1\n\n* commit \u00272c29a5cf1658532bca4e34f816fa30312241a336\u0027:\n visualizer: reset buffer if playback is idle\n" }, { "commit": "d8ad2fab90b4f6eb50ba9c45e140811bad848384", "tree": "c2cd2cf662dc681ade21ff668fbde0b6b86b34f2", "parents": [ "5dd4c6bcb4f477d5500c61fda9b460299d825975", "40461ee70161d8568663332f72be2353b04c34e7" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 11:51:12 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:51:12 2011 -0800" }, "message": "am 40461ee7: am cd556b82: Merge \"Instead of asserting, signal a runtime error if the session doesn\\\u0027t contain\" into ics-mr1\n\n* commit \u002740461ee70161d8568663332f72be2353b04c34e7\u0027:\n Instead of asserting, signal a runtime error if the session doesn\u0027t contain\n" }, { "commit": "ff0bd468d8cf0f51c07927c758563a3f696c32a4", "tree": "2ae0aaeb3967b5271bfad42def318fbf04d098b2", "parents": [ "e5fe1b302d68a1ca2ee3f16cdcbce276fe3d9776", "9c981cd3d53238f10842368c1cd82d625b701a47" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 11:51:09 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:51:09 2011 -0800" }, "message": "am 9c981cd3: am d9f25bc9: Merge \"Disconnect on socket error on the RTSP control connection.\" into ics-mr1\n\n* commit \u00279c981cd3d53238f10842368c1cd82d625b701a47\u0027:\n Disconnect on socket error on the RTSP control connection.\n" }, { "commit": "b7a000a6fb84ae75847e730332bae62ba1234999", "tree": "1ceed497531cee93e83e1ebce22575f37284f530", "parents": [ "23217182743521063655c6fb1b1580d3558cfbe7", "00aa51b355d2b9ae7604fe4c43f6e64193422dba" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Nov 11 10:49:24 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 10:49:24 2011 -0800" }, "message": "Merge \"Unhide the key to retriever location information in 3gp/mp4 files\" into ics-mr1" }, { "commit": "23217182743521063655c6fb1b1580d3558cfbe7", "tree": "8453db6b4612fb518e95bfe2510198ee2b3eab23", "parents": [ "424781e2e1a1f1447eea733ffd1dc0f8006b628e", "54c7efa4dd7300a2ab008d392a83bfbdf97cdfad" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 10:46:02 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 10:46:02 2011 -0800" }, "message": "Merge \"Didn\u0027t mean to check this in...\" into ics-mr1" }, { "commit": "54c7efa4dd7300a2ab008d392a83bfbdf97cdfad", "tree": "b1c99cce0a632e718efd042206a4387b034d9411", "parents": [ "cd556b82fd12dceb49e9d6543f80212721b220ec" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 10:17:00 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 10:17:00 2011 -0800" }, "message": "Didn\u0027t mean to check this in...\n\nChange-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7\n" }, { "commit": "1f8c621279ddb163ee3d63bf32d79955679db0c5", "tree": "4298f4a73f987baeddd085d799f5aee175a63b20", "parents": [ "cd556b82fd12dceb49e9d6543f80212721b220ec", "df8ab51ca664a29cf6d9d9a169286de0f36e772b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 11 08:17:22 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 08:17:22 2011 -0800" }, "message": "Merge \"visualizer: reset buffer if playback is idle\" into ics-mr1" }, { "commit": "cd556b82fd12dceb49e9d6543f80212721b220ec", "tree": "51e4d52ea2b3cbbe665d9fc1306b91472a992dff", "parents": [ "5d42075e450a49af2bb37ca3a9610921df7607f2", "57cc14fcc1642e0437b791ca3056e3728808092e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 07:39:25 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 07:39:25 2011 -0800" }, "message": "Merge \"Instead of asserting, signal a runtime error if the session doesn\u0027t contain\" into ics-mr1" }, { "commit": "5d42075e450a49af2bb37ca3a9610921df7607f2", "tree": "d050451f9e03105923990264f376ef8163f2973a", "parents": [ "d9f25bc941746f268ab978e6b2af7b7c4ec2ea89", "4d7dff1706b0fced0c912ebbb999aee4ede9bb1c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 07:39:18 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 07:39:18 2011 -0800" }, "message": "Merge \"DO NOT MERGE: Instead of asserting, remove active streams if their sockets\" into ics-mr1" }, { "commit": "d9f25bc941746f268ab978e6b2af7b7c4ec2ea89", "tree": "b8dc721c9ca6f9af4ee82537a8d7f514f4257e07", "parents": [ "754c72ed9e8e83e5a913aa7552fc2e1b1b5277e0", "58c94bf43410af4c2db835b056ec840b72bdab4e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 07:39:11 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 07:39:11 2011 -0800" }, "message": "Merge \"Disconnect on socket error on the RTSP control connection.\" into ics-mr1" }, { "commit": "f4c3cc06cb5d748e804a81e693175e00ccf06051", "tree": "5aa63090d1fa4a267a49eb588d0329c63194c627", "parents": [ "1333742bedc9b462024302f302e3a7f27053df66", "510180f162dee3ae5416a98caa07f58a754f4b3f" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Nov 11 15:34:21 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 15:34:21 2011 +0000" }, "message": "am 510180f1: am 08e42967: Merge \"Add support for retrieving location information in mp4/3gpp files\" into ics-mr1\n\n* commit \u0027510180f162dee3ae5416a98caa07f58a754f4b3f\u0027:\n Add support for retrieving location information in mp4/3gpp files\n" }, { "commit": "62b9aec7a0a4e1cf8cfec7e39ea3103ab510d72e", "tree": "7fbec5605ee4f4f82bb4bd1a57d48af8eda5b367", "parents": [ "e2d58e95a09590a63f1c597bb808b925bcab9a69" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Nov 07 11:10:16 2011 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Nov 11 07:30:19 2011 -0800" }, "message": "Don\u0027t check return value of new for being \u003d\u003d null\n\nnew either succeeds or throws an exception\n\nChange-Id: I1615e10c4f6730495c49e56b64714a00141ea8ff\n" }, { "commit": "00aa51b355d2b9ae7604fe4c43f6e64193422dba", "tree": "1b6a6c4e66681f32812f7a30937d05f394262cf3", "parents": [ "08e42967b9e459b7beb22e859f1f1eba0546741b" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Nov 10 14:46:26 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Nov 11 01:49:01 2011 -0800" }, "message": "Unhide the key to retriever location information in 3gp/mp4 files\n\nChange-Id: I71c651b403955c0f6f8df096e995a5f5f4e39130\nrelated-to-bug: 5560253\n" }, { "commit": "03466e35f2996fd3330452e38984f0012239305e", "tree": "73c74d12495a055d083a2d0330834ea84910f245", "parents": [ "0906005662ac6a28c34171275c0e500198640379", "1bc76127afee16c851a100370d4bb2987e94b362" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Nov 10 16:14:56 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 10 16:14:56 2011 -0800" }, "message": "Merge \"Adds handler type \u0027sbtl\u0027 to support subtitles in various containers.\"" }, { "commit": "58c94bf43410af4c2db835b056ec840b72bdab4e", "tree": "a1019a09465869efc2e4f0475599b4ff8708463c", "parents": [ "2375d16378e6f8b7694c5a2cd9e0622e382e6049" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 14:48:20 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 15:10:15 2011 -0800" }, "message": "Disconnect on socket error on the RTSP control connection.\n\nChange-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b\n" }, { "commit": "4d7dff1706b0fced0c912ebbb999aee4ede9bb1c", "tree": "823e565602271e1e3bfdfdb0063995b032161029", "parents": [ "2375d16378e6f8b7694c5a2cd9e0622e382e6049" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 14:26:43 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 12:41:51 2011 -0800" }, "message": "DO NOT MERGE: Instead of asserting, remove active streams if their sockets\n\nreturn failure\n\nChange-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79\nrelated-to-bug: 5593654\n" }, { "commit": "57cc14fcc1642e0437b791ca3056e3728808092e", "tree": "3867870ca7ef59858a03a82f9c3edbf10b2d5814", "parents": [ "2375d16378e6f8b7694c5a2cd9e0622e382e6049" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 12:40:30 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 12:40:30 2011 -0800" }, "message": "Instead of asserting, signal a runtime error if the session doesn\u0027t contain\n\nany playable tracks at all.\n\nChange-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6\n" }, { "commit": "77c500c9a1f763b31fb5a03c803b3523fcb72310", "tree": "9feafc0d06b27223cd189b22d7bf7bc2c82c11ef", "parents": [ "785fd3685a69e5b3ef9c0958dcf4ae85f818e78d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Nov 09 00:48:56 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Nov 10 11:40:11 2011 -0800" }, "message": "Add support for retrieving location information in mp4/3gpp files\n\nChange-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687\nrelated-to-bug: 5560253\n" }, { "commit": "62c0c3215d479b97a7538954e635f44a1c536100", "tree": "267a4982f4cac17324520555f31bd147c3d9c4c3", "parents": [ "58941d8dcb528ce82eb29ef76bedfb2e4d035590", "9e2949c6ab4e791b5c20d5e85c3eff62f206a99b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 19:39:38 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 10 19:39:38 2011 +0000" }, "message": "am 9e2949c6: am 2375d163: Merge \"Send RTSP control connection keep-alive requests\" into ics-mr1\n\n* commit \u00279e2949c6ab4e791b5c20d5e85c3eff62f206a99b\u0027:\n Send RTSP control connection keep-alive requests\n" }, { "commit": "58941d8dcb528ce82eb29ef76bedfb2e4d035590", "tree": "876ca1a664c7f402d613fbbf1a91e0ceedb419ad", "parents": [ "2276b1774ace0fd739fea20e9a6c430a0a0e758e", "2dff5cdc362ff6026e71d4b96faea8f2d7bd7063" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 19:39:36 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 10 19:39:36 2011 +0000" }, "message": "am 2dff5cdc: am b42aea5b: Merge \"Don\\\u0027t believe the PV decoder\\\u0027s lies...\" into ics-mr1\n\n* commit \u00272dff5cdc362ff6026e71d4b96faea8f2d7bd7063\u0027:\n Don\u0027t believe the PV decoder\u0027s lies...\n" }, { "commit": "2276b1774ace0fd739fea20e9a6c430a0a0e758e", "tree": "2124abfc30616d3937fa67258f901909f1fa7771", "parents": [ "021d33817b88e00474a8ce6948777628ac7bbb70", "ec04f4ac23e5fe8f90267d09ddda8c0aa684c147" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 19:39:34 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 10 19:39:34 2011 +0000" }, "message": "am ec04f4ac: am 7c063cf9: Merge \"There\\\u0027s no point in trying to continue to decode after an error was signalled.\" into ics-mr1\n\n* commit \u0027ec04f4ac23e5fe8f90267d09ddda8c0aa684c147\u0027:\n There\u0027s no point in trying to continue to decode after an error was signalled.\n" }, { "commit": "7707cd9920219bfb57b95c61bf0e3eb1ad83795d", "tree": "573534eee347c0d628ac2ddff6d6345b4ff6cb59", "parents": [ "2f87ca01c765dd45aec66da04a02d211a71cbcc9", "58f3a7123d0da6d35424429f3c0bbfbd32c00117" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Nov 10 19:39:29 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 10 19:39:29 2011 +0000" }, "message": "am 58f3a712: am 7c61fa70: Merge \"Fix problems in tablet silent mode.\" into ics-mr1\n\n* commit \u002758f3a7123d0da6d35424429f3c0bbfbd32c00117\u0027:\n Fix problems in tablet silent mode.\n" }, { "commit": "df8ab51ca664a29cf6d9d9a169286de0f36e772b", "tree": "0c1d6a2584c0a50f735c66c81d07d8792b9772b7", "parents": [ "843e04d977fd348ed474da1d3c6a62e7dc837444" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Nov 10 10:02:18 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Nov 10 10:27:05 2011 -0800" }, "message": "visualizer: reset buffer if playback is idle\n\nVisualizer capture buffer must be reset if audio framework has stopped\ncalling process for a given period of time to get read of residual\ndata from previous captures.\n\nIssue 5571920.\n\nChange-Id: I6e73f971bb812cdbb2979a3b5e763abab07634eb\n" }, { "commit": "2375d16378e6f8b7694c5a2cd9e0622e382e6049", "tree": "ab73a25bebd8a7f1e05c5cf379acf2efd7700939", "parents": [ "b42aea5b4c7cc7b2766f80f5ceda94b324d776e5", "a1b3e3d49ea04cc42aadbd07a6304008fda1e515" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 08:48:44 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 10 08:48:44 2011 -0800" }, "message": "Merge \"Send RTSP control connection keep-alive requests\" into ics-mr1" }, { "commit": "b42aea5b4c7cc7b2766f80f5ceda94b324d776e5", "tree": "5f06d48c8749af3a42f54ed85c01ac160e7b191e", "parents": [ "7c063cf9679a2ecdda5e1639cfdca3e1084019f9", "977702929b085882aa7a748711cc3280f3195fbe" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 08:48:34 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 10 08:48:34 2011 -0800" }, "message": "Merge \"Don\u0027t believe the PV decoder\u0027s lies...\" into ics-mr1" }, { "commit": "7c063cf9679a2ecdda5e1639cfdca3e1084019f9", "tree": "53a6d9479c92bf1365c2dbdb6f124f39f4b76ce6", "parents": [ "c60baec7a737d3c3cd596c5c4378a6e12450da3d", "3f99d953129a41d25b5f5f7b8341c67cf5198248" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 08:47:25 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 10 08:47:25 2011 -0800" }, "message": "Merge \"There\u0027s no point in trying to continue to decode after an error was signalled.\" into ics-mr1" }, { "commit": "1bc76127afee16c851a100370d4bb2987e94b362", "tree": "6520f5c7a1640036a61a4138289b86e70850ee71", "parents": [ "17fe6c8d0712a494dd8c7eeae0048850972f0f2a" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Nov 10 16:11:26 2011 +0900" }, "committer": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Nov 10 16:41:04 2011 +0900" }, "message": "Adds handler type \u0027sbtl\u0027 to support subtitles in various containers.\n\nChange-Id: I16d2c5d9aeb087b958e28052f266ca0ef42ea7f1\n" }, { "commit": "96a33d1caad2fab0bc28891cfbf553f4b050bf0b", "tree": "9a2560cbaa3a850793a0c7de5738953dcc859807", "parents": [ "36a7f2a9adfa21ec31f00d496fef82e68931c860" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Nov 08 10:31:57 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Nov 09 18:06:37 2011 -0800" }, "message": "Fix problems in tablet silent mode.\n\nDo not enter silent mode when ALARM stream volume is changed\nto 0 by volume down key: Only RING, NOTIFICATION and MUSIC\nstreams control silent mode.\n\nReport correct volume (0) for NOTIFICATION stream when silent mode\nis entered by changing NOTIFICATION stream volume to 0 with\nvolume down key.\n\nChange-Id: I3e0816dfae40bc127cc30cca02cdca6ec19e30a4\n" }, { "commit": "b516b96d889f78345d81ce499e9258876bbf8014", "tree": "710d84ada9d72e73774e80a2ebd029656cc087a1", "parents": [ "5cc8b1f0fda91f43346ef1ac293c027421f369d5", "05079be1849df74d63e70153fe8b46b088e8cd74" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 14:47:51 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 09 14:47:51 2011 -0800" }, "message": "Merge \"Instead of asserting, remove active streams if their sockets return failure\"" }, { "commit": "05079be1849df74d63e70153fe8b46b088e8cd74", "tree": "429064f87b4b36b38a367ece22c9eebf0f0ae150", "parents": [ "e43a7c18ecf3de8df774362a9bc3e97d8469ac00" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 14:26:43 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 14:26:43 2011 -0800" }, "message": "Instead of asserting, remove active streams if their sockets return failure\n\nChange-Id: Ic5cc786f718cf921876b181927cf1b03e8373ff1\nrelated-to-bug: 5593654\n" }, { "commit": "714211068e77507baf227fad86ad88b9248b9236", "tree": "873e4e503a46f4911a9e1f09bfc09df1deac40f0", "parents": [ "7aa2376609b8fef959101361e5a2727a957d4ecd", "bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 09 21:19:00 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 09 21:19:00 2011 +0000" }, "message": "am bb1b7d5c: am 19998120: Merge \"Bug 5478024 drop after decode if can\\\u0027t drop before\" into ics-mr0\n\n* commit \u0027bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad\u0027:\n Bug 5478024 drop after decode if can\u0027t drop before\n" }, { "commit": "3f99d953129a41d25b5f5f7b8341c67cf5198248", "tree": "ef3235be96bb79291a3f48a9b8b88e46d12b30f6", "parents": [ "b78ae7524eecbca01a53994d6872202633c8341b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 10:26:06 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 10:26:06 2011 -0800" }, "message": "There\u0027s no point in trying to continue to decode after an error was signalled.\n\nChange-Id: I2a2410cac9444eadd85be5d104799703171f1a24\nrelated-to-bug: 5588658\n" }, { "commit": "977702929b085882aa7a748711cc3280f3195fbe", "tree": "1cb4da509139675e4d505b57b2831170bdcf3944", "parents": [ "b78ae7524eecbca01a53994d6872202633c8341b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 10:03:07 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 10:03:07 2011 -0800" }, "message": "Don\u0027t believe the PV decoder\u0027s lies...\n\nChange-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27\n" }, { "commit": "f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2", "tree": "ea639f688e5a2951159124bea2a93146b93c8762", "parents": [ "9c5c97f61818f4d20079616a98d62f888f07d285", "19998120f53caceb620f138c6eea182f1e693660" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 09 16:41:19 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 09 16:41:19 2011 +0000" }, "message": "am 19998120: Merge \"Bug 5478024 drop after decode if can\\\u0027t drop before\" into ics-mr0\n\n* commit \u002719998120f53caceb620f138c6eea182f1e693660\u0027:\n Bug 5478024 drop after decode if can\u0027t drop before\n" }, { "commit": "bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad", "tree": "43f60c1a564ca7e89dcaae68fb3fd4f4c108ccb1", "parents": [ "2c6539e83ea80c62ee1a299fb686b4bdf043bfa7", "19998120f53caceb620f138c6eea182f1e693660" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 09 14:35:18 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 09 14:35:18 2011 +0000" }, "message": "am 19998120: Merge \"Bug 5478024 drop after decode if can\\\u0027t drop before\" into ics-mr0\n\n* commit \u002719998120f53caceb620f138c6eea182f1e693660\u0027:\n Bug 5478024 drop after decode if can\u0027t drop before\n" }, { "commit": "a1b3e3d49ea04cc42aadbd07a6304008fda1e515", "tree": "1418aa82281e92abb168819b08a3ffe936d616b6", "parents": [ "b78ae7524eecbca01a53994d6872202633c8341b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 08 15:31:23 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 08 15:39:15 2011 -0800" }, "message": "Send RTSP control connection keep-alive requests\n\ndefault to 60 secs unless overridden by server\u0027s session-id response.\n\nChange-Id: I7c3aff5b787dbb57cc0dccf9db3c75e5cf7e778c\nrelated-to-bug: 5562303\n" }, { "commit": "ea427b0c87a52d5e770f50856401a81ff2658cc4", "tree": "9f4e0ec427bd0b9ca6c8a3575bd784fc78c9968a", "parents": [ "e43a7c18ecf3de8df774362a9bc3e97d8469ac00", "26f70db99f483be36caa7a4c84fec5de50bec034" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 08 10:40:20 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 08 10:40:20 2011 -0800" }, "message": "resolved conflicts for merge of 26f70db9 to master\n\nChange-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120\n" }, { "commit": "26f70db99f483be36caa7a4c84fec5de50bec034", "tree": "bb5e0c42bc4d564b8919a2c4fb302026a89582e6", "parents": [ "99015a2464a40097c3e23e07cdf69da0f886aa66", "95be24585f46229f551c529104b5e92fa4316b38" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 08 08:48:31 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 08 08:48:31 2011 -0800" }, "message": "Merge \"Remove surface legacy APIs and code.\" into ics-mr1" }, { "commit": "30885bd4799d16c4ffc0ab609e649dad8ed6119c", "tree": "79fc377d6b53f6a22c76cc2cfe42239b44f65252", "parents": [ "977442c48740a1b2edd4e95a21afe1d0033f1ef4", "713c9a331e226c970af57c59ff17be29b73025c1" ], "author": { "name": "Chih-Chung Chang", "email": "chihchung@google.com", "time": "Tue Nov 08 07:04:36 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 08 07:04:36 2011 +0000" }, "message": "am 713c9a33: Merge \"Fix 5509346: Resize the thumbnails if it\\\u0027s too large.\" into ics-mr1\n\n* commit \u0027713c9a331e226c970af57c59ff17be29b73025c1\u0027:\n Fix 5509346: Resize the thumbnails if it\u0027s too large.\n" }, { "commit": "977442c48740a1b2edd4e95a21afe1d0033f1ef4", "tree": "f46ca283ca9bbf833832e8eda219624c10ced09f", "parents": [ "bfd978355695e1a3a2887716f3d8fe028daa6005", "ee7ebb3257d9337627b175835dc3d08f9b8ab339" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 08 07:00:34 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 08 07:00:34 2011 +0000" }, "message": "am ee7ebb32: Merge \"Fix a hang issue where the first frame can be dropped for timelapse video recording.\" into ics-mr1\n\n* commit \u0027ee7ebb3257d9337627b175835dc3d08f9b8ab339\u0027:\n Fix a hang issue where the first frame can be dropped for timelapse video recording.\n" }, { "commit": "713c9a331e226c970af57c59ff17be29b73025c1", "tree": "890c72f52a669374cf388aec8758ec73f1ce2980", "parents": [ "ee7ebb3257d9337627b175835dc3d08f9b8ab339", "b1224ff1c4ef8324c9d76b857463787aabd84707" ], "author": { "name": "Chih-Chung Chang", "email": "chihchung@google.com", "time": "Mon Nov 07 22:59:55 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 07 22:59:55 2011 -0800" }, "message": "Merge \"Fix 5509346: Resize the thumbnails if it\u0027s too large.\" into ics-mr1" } ], "next": "ee7ebb3257d9337627b175835dc3d08f9b8ab339" }