)]}' { "log": [ { "commit": "776bfd806a1619ac0944d4ea36330c4cde4d665d", "tree": "b6bf5025e4fd0db49effcac6b7cba3cfd441b783", "parents": [ "0af43510cc45373614cdfce7d014283100e96cb9", "8a55bcb640c8842348eb41495fdb8fe82cb0465d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 17:54:22 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 17:54:22 2015 +0000" }, "message": "am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev\n\n* commit \u00278a55bcb640c8842348eb41495fdb8fe82cb0465d\u0027:\n Sanity check padding/delay values for gapless playback\n" }, { "commit": "8a55bcb640c8842348eb41495fdb8fe82cb0465d", "tree": "41f51f4322964bf2e296821d8a6f0c8863234603", "parents": [ "2562495de9338e14ca3a3ef74ce07a7b310cd1fb", "ced2dd3ccf8920621b931bb4b5d9df9a9a23449a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 10:26:33 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 20 10:26:33 2015 -0700" }, "message": "resolved conflicts for merge of ced2dd3c to lmp-dev\n\nChange-Id: I5dbb4f7d6c38c75a54c59d5e59305657bc50ab10\n" }, { "commit": "ced2dd3ccf8920621b931bb4b5d9df9a9a23449a", "tree": "437b24d2bc2cba6bc3bbefdfa80211be2c0bc75a", "parents": [ "a590baca031199327f6382347625dd232de2c95c", "2c880dde90e4303f9201f46124ee879325c57ba0" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Thu Aug 20 17:04:05 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 17:04:05 2015 +0000" }, "message": "am 2c880dde: Merge \"Sanity check padding/delay values for gapless playback\" into klp-dev\n\n* commit \u00272c880dde90e4303f9201f46124ee879325c57ba0\u0027:\n Sanity check padding/delay values for gapless playback\n" }, { "commit": "0af43510cc45373614cdfce7d014283100e96cb9", "tree": "2b79d422fe63ac6b23505f586eca4564055da08d", "parents": [ "e3cb25078b814b40f8e1506514bd17066935a51f", "2562495de9338e14ca3a3ef74ce07a7b310cd1fb" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 16:59:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 16:59:43 2015 +0000" }, "message": "am 2562495d: am a590baca: Merge commit \\\u00276ae815e0\\\u0027 into HEAD\n\n* commit \u00272562495de9338e14ca3a3ef74ce07a7b310cd1fb\u0027:\n libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\n" }, { "commit": "2562495de9338e14ca3a3ef74ce07a7b310cd1fb", "tree": "81b550847bc49f1625eeb3f194f8efc65036bdb8", "parents": [ "4b995f73b581ce0705b537317f32ad76bddb55fa", "a590baca031199327f6382347625dd232de2c95c" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 16:53:41 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 16:53:41 2015 +0000" }, "message": "am a590baca: Merge commit \\\u00276ae815e0\\\u0027 into HEAD\n\n* commit \u0027a590baca031199327f6382347625dd232de2c95c\u0027:\n libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\n" }, { "commit": "a590baca031199327f6382347625dd232de2c95c", "tree": "40c192b35abb2006e02b514fbb5a19fafc3370cd", "parents": [ "5221133bfa1585b4488b01cad165627b1cd17077", "6ae815e04f618207da9ce52e3c828492c33a7107" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 09:42:08 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 09:42:08 2015 -0700" }, "message": "Merge commit \u00276ae815e0\u0027 into HEAD\n\nlibstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\n\nBug: 23270724\n(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)\n\nChange-Id: I44c642548ee6ba3745fb1f46d8645bece231035a\n" }, { "commit": "e3cb25078b814b40f8e1506514bd17066935a51f", "tree": "ad4526b1535595df13a88d361e9ca5faba8420d7", "parents": [ "84a4221e305847fb0c8846122fe8f2bc7c2fda0a", "4b995f73b581ce0705b537317f32ad76bddb55fa" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 04:31:45 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 04:31:45 2015 +0000" }, "message": "am 4b995f73: Merge \"libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\" into lmp-dev\n\n* commit \u00274b995f73b581ce0705b537317f32ad76bddb55fa\u0027:\n libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\n" }, { "commit": "4b995f73b581ce0705b537317f32ad76bddb55fa", "tree": "fbef9d0625edd8e0c489b88061026c04c292fad1", "parents": [ "a9b3cd3c101b68522a3d8492cb3a19d8b5409329", "5a132594b531f1f48098a790927f82080cc27f61" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 04:25:47 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 20 04:25:47 2015 +0000" }, "message": "Merge \"libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\" into lmp-dev" }, { "commit": "84a4221e305847fb0c8846122fe8f2bc7c2fda0a", "tree": "456fb68735b6b57ba60abe511c771ace336c9fd6", "parents": [ "096a931e5a0d5f45c3546b09046912b4d54136c8", "a9b3cd3c101b68522a3d8492cb3a19d8b5409329" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 04:16:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 04:16:58 2015 +0000" }, "message": "am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.\n\n* commit \u0027a9b3cd3c101b68522a3d8492cb3a19d8b5409329\u0027:\n libstagefright: fix overflow in pvdec_api.cpp.\n" }, { "commit": "a9b3cd3c101b68522a3d8492cb3a19d8b5409329", "tree": "e849016209326c1b563ed92be7ab2d0518419b92", "parents": [ "fd5942b332c5f6e4dc50f50181344957334854e1", "5221133bfa1585b4488b01cad165627b1cd17077" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 04:10:56 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 04:10:56 2015 +0000" }, "message": "am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.\n\n* commit \u00275221133bfa1585b4488b01cad165627b1cd17077\u0027:\n libstagefright: fix overflow in pvdec_api.cpp.\n" }, { "commit": "2c880dde90e4303f9201f46124ee879325c57ba0", "tree": "1046e8298b670c9aa23252f535fc3f9510bb2718", "parents": [ "6ae815e04f618207da9ce52e3c828492c33a7107", "ba6093a4c6997b9d36d9700ee8c974941bf82e3a" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Thu Aug 20 04:06:25 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 20 04:06:25 2015 +0000" }, "message": "Merge \"Sanity check padding/delay values for gapless playback\" into klp-dev" }, { "commit": "5221133bfa1585b4488b01cad165627b1cd17077", "tree": "6824c47d8b1cb36beb2c04f49e72a7aa1bcc7940", "parents": [ "6b52d191f96c611b768318eec74d25908da76d03", "b2ae4351539de9aa4667fcb3e02ba40d9c6bd094" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 04:04:08 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 04:04:08 2015 +0000" }, "message": "am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.\n\n* commit \u0027b2ae4351539de9aa4667fcb3e02ba40d9c6bd094\u0027:\n libstagefright: fix overflow in pvdec_api.cpp.\n" }, { "commit": "6ae815e04f618207da9ce52e3c828492c33a7107", "tree": "42f8cf5d811238df117abba1a9848b32c6f2d8fb", "parents": [ "b2ae4351539de9aa4667fcb3e02ba40d9c6bd094", "937c6bedd4b6e5c6cb29a238eb459047dedd3486" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 04:01:18 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 20 04:01:18 2015 +0000" }, "message": "Merge \"libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\" into klp-dev" }, { "commit": "937c6bedd4b6e5c6cb29a238eb459047dedd3486", "tree": "de9072b197da1e8b0e7ebe6a0ea2f162237d191d", "parents": [ "916a9684295fb578f4b3c6c16b621ef201a49964" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 14:32:16 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 03:53:44 2015 +0000" }, "message": "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\n\nBug: 23270724\nChange-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4\n(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)\n" }, { "commit": "b2ae4351539de9aa4667fcb3e02ba40d9c6bd094", "tree": "aa8ac42170bb5e669d625f7bc351327780feda61", "parents": [ "916a9684295fb578f4b3c6c16b621ef201a49964" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 19 17:31:51 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 20 03:36:58 2015 +0000" }, "message": "libstagefright: fix overflow in pvdec_api.cpp.\n\nBug: 20674086\nChange-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3\n(cherry picked from commit d7bb1cd786e5ea4ac61119cc1a08082474f7787b)\n" }, { "commit": "5a132594b531f1f48098a790927f82080cc27f61", "tree": "5cae2d5d3053b47df8999782599121b493161650", "parents": [ "fd5942b332c5f6e4dc50f50181344957334854e1" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 11:17:24 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 19 12:43:56 2015 -0700" }, "message": "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\n\nBug: 23247055\nChange-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd\n(cherry picked from commit 3564c4562f46bede6ef1ea716c4fd4f77e470ae8)\n(cherry picked from commit 108cd2dc8df55f3f2ecdfbb4bb0ae981a74b6860)\n" }, { "commit": "096a931e5a0d5f45c3546b09046912b4d54136c8", "tree": "d86313cb7e53e112ce872189cec811c7aec89e3b", "parents": [ "84fb58bdf6bfb5bf362c0e1cc6a5bad41e8554f5", "fd5942b332c5f6e4dc50f50181344957334854e1" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 18 21:58:54 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 21:58:54 2015 +0000" }, "message": "am fd5942b3: am 6b52d191: (-s ours) am 916a9684: Merge \"DO NOT MERGE - audio flinger: fix fuzz test crash\" into klp-dev\n\n* commit \u0027fd5942b332c5f6e4dc50f50181344957334854e1\u0027:\n DO NOT MERGE - audio flinger: fix fuzz test crash\n" }, { "commit": "84fb58bdf6bfb5bf362c0e1cc6a5bad41e8554f5", "tree": "d86313cb7e53e112ce872189cec811c7aec89e3b", "parents": [ "25c00122a640ee311e6e72df401c362ec798617d", "bdb5e49787dcb56fec68a2410a0985bfe388cd14" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 18 21:52:31 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 21:52:31 2015 +0000" }, "message": "am bdb5e497: Merge \"DO NOT MERGE - audio flinger: fix fuzz test crash\" into lmp-dev\n\n* commit \u0027bdb5e49787dcb56fec68a2410a0985bfe388cd14\u0027:\n DO NOT MERGE - audio flinger: fix fuzz test crash\n" }, { "commit": "fd5942b332c5f6e4dc50f50181344957334854e1", "tree": "b4c062f79784e3f64caa5dc4e4f0931e3963625d", "parents": [ "bdb5e49787dcb56fec68a2410a0985bfe388cd14", "6b52d191f96c611b768318eec74d25908da76d03" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 18 21:51:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 21:51:55 2015 +0000" }, "message": "am 6b52d191: (-s ours) am 916a9684: Merge \"DO NOT MERGE - audio flinger: fix fuzz test crash\" into klp-dev\n\n* commit \u00276b52d191f96c611b768318eec74d25908da76d03\u0027:\n DO NOT MERGE - audio flinger: fix fuzz test crash\n" }, { "commit": "6b52d191f96c611b768318eec74d25908da76d03", "tree": "988dd6b443bf363307033e527734dbebf994d342", "parents": [ "5d7a381b9c86ff4f00a95063d57ad0a80467799c", "916a9684295fb578f4b3c6c16b621ef201a49964" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 18 21:45:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 21:45:18 2015 +0000" }, "message": "am 916a9684: Merge \"DO NOT MERGE - audio flinger: fix fuzz test crash\" into klp-dev\n\n* commit \u0027916a9684295fb578f4b3c6c16b621ef201a49964\u0027:\n DO NOT MERGE - audio flinger: fix fuzz test crash\n" }, { "commit": "bdb5e49787dcb56fec68a2410a0985bfe388cd14", "tree": "b4c062f79784e3f64caa5dc4e4f0931e3963625d", "parents": [ "4ce86e781bf5ac7ef047cdb81db858fae12fd334", "b97ee930e4f7ed1587b869c92b4aa1dc90b641cc" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 18 21:44:50 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 21:44:50 2015 +0000" }, "message": "Merge \"DO NOT MERGE - audio flinger: fix fuzz test crash\" into lmp-dev" }, { "commit": "916a9684295fb578f4b3c6c16b621ef201a49964", "tree": "4c1a4cabe7ff1ebac46444e1d91bd4ae9b17a9c5", "parents": [ "877c76ac42701859fb8185f05c4724a06867fc07", "22ac20eff5b67f33b9d04ca54abeaa22ce201039" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 18 21:33:46 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 21:33:46 2015 +0000" }, "message": "Merge \"DO NOT MERGE - audio flinger: fix fuzz test crash\" into klp-dev" }, { "commit": "b97ee930e4f7ed1587b869c92b4aa1dc90b641cc", "tree": "b4917494c7a99ff9d4ed9552d2a5f205931593ca", "parents": [ "65842db06c2d77e53cc5ac61692160d844cc7d0a" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 08 10:50:03 2015 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 18 11:25:37 2015 -0700" }, "message": "DO NOT MERGE - audio flinger: fix fuzz test crash\n\nClear output stream pointer in duplicating thread\nwhen the main output to which it is attached is closed.\n\nAlso do not forward master mute and volume commands to\nduplicating threads as this is not applicable.\n\nAlso fix logic in AudioFlinger::primaryPlaybackThread_l()\nthat could accidentally return a duplicating thread.\nThis never happens because the primary thread is always\nfirst in the list.\n\nBug: 20731946.\nChange-Id: Ic8869699836920351b23d09544c50a258d3fb585\n(cherry picked from commit f6870aefc5e31d4220f3778c4e79ff34a61f48ad)\n" }, { "commit": "25c00122a640ee311e6e72df401c362ec798617d", "tree": "da7e3df83b300513e4954345c032f74c9966d477", "parents": [ "3e9ed500718386db2d70d555098fa1e931e75d28", "4ce86e781bf5ac7ef047cdb81db858fae12fd334" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Aug 18 18:23:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 18:23:44 2015 +0000" }, "message": "am 4ce86e78: am 5d7a381b: am 877c76ac: Merge \"stagefright: check IMemory::pointer() before using the allocation\" into klp-dev\n\n* commit \u00274ce86e781bf5ac7ef047cdb81db858fae12fd334\u0027:\n stagefright: check IMemory::pointer() before using the allocation\n" }, { "commit": "3e9ed500718386db2d70d555098fa1e931e75d28", "tree": "1061eb765674c824e44a15b8bb769e3a36a93bf6", "parents": [ "fc26577c6023ac6861c1875e6ae02f23ce53afc0", "8a1a5d17ddc3ff902a9d9e1858713ed9406c45c8" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 18:23:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 18:23:43 2015 +0000" }, "message": "am 8a1a5d17: am 9707195b: am f97b6bee: Merge \"Check integer overflow to prevent memory corruption\" into klp-dev\n\n* commit \u00278a1a5d17ddc3ff902a9d9e1858713ed9406c45c8\u0027:\n Check integer overflow to prevent memory corruption\n" }, { "commit": "fc26577c6023ac6861c1875e6ae02f23ce53afc0", "tree": "8eaf42277d9da24f6be6e4cd26c3dee67f8b56f2", "parents": [ "4b153ff9b5c979684ed0a53d52a3ad90ec7f7d22", "698ff79c1e37f01678231eb4f57dc8f6574a7f83" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 18:23:42 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 18:23:42 2015 +0000" }, "message": "am 698ff79c: am 27362395: (-s ours) am 2ed42aea: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into klp-dev\n\n* commit \u0027698ff79c1e37f01678231eb4f57dc8f6574a7f83\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "4b153ff9b5c979684ed0a53d52a3ad90ec7f7d22", "tree": "8eaf42277d9da24f6be6e4cd26c3dee67f8b56f2", "parents": [ "484ebc81263a627b5e24e65373ab0752996ca0c8", "2f3c04a4e92aabea09325cd6870d74a705d98dd8" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 18 18:23:42 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 18:23:42 2015 +0000" }, "message": "am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev\n\n* commit \u00272f3c04a4e92aabea09325cd6870d74a705d98dd8\u0027:\n MPEG4Source::fragmentedRead: check range before writing into buffers\n" }, { "commit": "4ce86e781bf5ac7ef047cdb81db858fae12fd334", "tree": "517e7fbfceaffb7486bac1e6268b32e757e06123", "parents": [ "8a1a5d17ddc3ff902a9d9e1858713ed9406c45c8", "5d7a381b9c86ff4f00a95063d57ad0a80467799c" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Aug 18 18:20:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 18:20:29 2015 +0000" }, "message": "am 5d7a381b: am 877c76ac: Merge \"stagefright: check IMemory::pointer() before using the allocation\" into klp-dev\n\n* commit \u00275d7a381b9c86ff4f00a95063d57ad0a80467799c\u0027:\n stagefright: check IMemory::pointer() before using the allocation\n" }, { "commit": "8a1a5d17ddc3ff902a9d9e1858713ed9406c45c8", "tree": "b1d9ae6ea6ef261034a0935b0f2b491e76cdae17", "parents": [ "698ff79c1e37f01678231eb4f57dc8f6574a7f83", "9707195bf18fed1318e5c747db82f9783262a137" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 18:20:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 18:20:27 2015 +0000" }, "message": "am 9707195b: am f97b6bee: Merge \"Check integer overflow to prevent memory corruption\" into klp-dev\n\n* commit \u00279707195bf18fed1318e5c747db82f9783262a137\u0027:\n Check integer overflow to prevent memory corruption\n" }, { "commit": "698ff79c1e37f01678231eb4f57dc8f6574a7f83", "tree": "8b6d5fd08ebce7007ce4a41434bc21b402df9000", "parents": [ "2f3c04a4e92aabea09325cd6870d74a705d98dd8", "27362395cec5673a9cbfe7179ad5490c4e475329" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 18:20:25 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 18:20:25 2015 +0000" }, "message": "am 27362395: (-s ours) am 2ed42aea: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into klp-dev\n\n* commit \u002727362395cec5673a9cbfe7179ad5490c4e475329\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "5d7a381b9c86ff4f00a95063d57ad0a80467799c", "tree": "a2aaa751fe9a7d39666587682be94896e3bd19ac", "parents": [ "9707195bf18fed1318e5c747db82f9783262a137", "877c76ac42701859fb8185f05c4724a06867fc07" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Aug 18 17:07:34 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 17:07:34 2015 +0000" }, "message": "am 877c76ac: Merge \"stagefright: check IMemory::pointer() before using the allocation\" into klp-dev\n\n* commit \u0027877c76ac42701859fb8185f05c4724a06867fc07\u0027:\n stagefright: check IMemory::pointer() before using the allocation\n" }, { "commit": "2f3c04a4e92aabea09325cd6870d74a705d98dd8", "tree": "8b6d5fd08ebce7007ce4a41434bc21b402df9000", "parents": [ "a1e462e5531db20d1dc70c3e24c82879a0a90870", "6035c811849a8475697268cf71b5cf923705abe8" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 18 09:57:24 2015 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 18 09:57:24 2015 -0700" }, "message": "resolved conflicts for merge of 6035c811 to lmp-dev\n\nChange-Id: Icf911f31e207c4c658047f6bfe8088d697b04ed6\n" }, { "commit": "877c76ac42701859fb8185f05c4724a06867fc07", "tree": "01b5c74709088c02ad0be92c595c948dde5eb988", "parents": [ "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a", "8ec845c8fe0f03bc57c901bc484541bdd6a7cf80" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue Aug 18 16:55:38 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 16:55:38 2015 +0000" }, "message": "Merge \"stagefright: check IMemory::pointer() before using the allocation\" into klp-dev" }, { "commit": "ba6093a4c6997b9d36d9700ee8c974941bf82e3a", "tree": "8f295f522d965924e9b4e4aff2c7d34a06dc4221", "parents": [ "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Aug 18 09:55:24 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Aug 18 09:55:24 2015 -0700" }, "message": "Sanity check padding/delay values for gapless playback\n\nBug: 23306638\nChange-Id: I2b5160e0f58f90d3f67c3964f41f5734ec0da053\n" }, { "commit": "484ebc81263a627b5e24e65373ab0752996ca0c8", "tree": "0de2098f0ca5d431a85961d2d63b9295f240f88c", "parents": [ "54ea6c02570ca87e94b03e0a8468dfc2f20536b7", "a1e462e5531db20d1dc70c3e24c82879a0a90870" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 16:40:50 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:40:50 2015 +0000" }, "message": "am a1e462e5: am 0afecdeb: am aa1cc741: Merge \"Check buffer size before using it\" into klp-dev\n\n* commit \u0027a1e462e5531db20d1dc70c3e24c82879a0a90870\u0027:\n Check buffer size before using it\n" }, { "commit": "54ea6c02570ca87e94b03e0a8468dfc2f20536b7", "tree": "36c71d68f42ba51bbcd6f306001c6686366bbf1d", "parents": [ "de47cd3c5223bb0fdd7376f8ea21ba2f857bafbe", "5ff4bb7a65f0495c2cd79413ef3001b208ae7e2c" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:40:49 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:40:49 2015 +0000" }, "message": "am 5ff4bb7a: am 8026ad38: am 6efa86be: Merge \"Check vector size before accessing\" into klp-dev\n\n* commit \u00275ff4bb7a65f0495c2cd79413ef3001b208ae7e2c\u0027:\n Check vector size before accessing\n" }, { "commit": "de47cd3c5223bb0fdd7376f8ea21ba2f857bafbe", "tree": "8d224b42a7259bc773be43dcee4e5fdd8c97d693", "parents": [ "00887af170d5302d1030e107ed3db969b05edcb4", "3b77e940822e8a5ef4953b709bdae00fa1bcca43" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:40:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:40:48 2015 +0000" }, "message": "am 3b77e940: am d146d466: am 6f561b93: Merge \"MatroskaExtractor: detect infinite loop when parsing NALs\" into klp-dev\n\n* commit \u00273b77e940822e8a5ef4953b709bdae00fa1bcca43\u0027:\n MatroskaExtractor: detect infinite loop when parsing NALs\n" }, { "commit": "00887af170d5302d1030e107ed3db969b05edcb4", "tree": "2b70c9c85a465527e656f89fbb0723c6750487fd", "parents": [ "3c803e7f777ad745b1b2cae0bdb2a31b11d47e80", "e9a8362e1d379e90655e904ca49d6333e4218eda" ], "author": { "name": "Neel Mehta", "email": "nmehta@google.com", "time": "Tue Aug 18 16:40:47 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:40:47 2015 +0000" }, "message": "am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354\n\n* commit \u0027e9a8362e1d379e90655e904ca49d6333e4218eda\u0027:\n Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354\n" }, { "commit": "3c803e7f777ad745b1b2cae0bdb2a31b11d47e80", "tree": "8be9f492ebfb6f4b14662f00ce308ed22ceaaaa1", "parents": [ "93bc61764eb8417165de2bbaa6384165f7298a32", "6afd8574d44ae158bed9cafe1c74dd1bfc5573b6" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:40:46 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:40:46 2015 +0000" }, "message": "am 6afd8574: am 073a656d: am deba0610: Merge \"Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\" into klp-dev\n\n* commit \u00276afd8574d44ae158bed9cafe1c74dd1bfc5573b6\u0027:\n Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\n" }, { "commit": "93bc61764eb8417165de2bbaa6384165f7298a32", "tree": "add190e891cceffcec4471685d6a36a8e2e37714", "parents": [ "91fc84f2102f222607d402953d9c1d4383e15a71", "01841c73a5a824a34d794ec69e2769b088306485" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:40:45 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:40:45 2015 +0000" }, "message": "am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\n* commit \u002701841c73a5a824a34d794ec69e2769b088306485\u0027:\n Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n" }, { "commit": "91fc84f2102f222607d402953d9c1d4383e15a71", "tree": "d7cb00bd54c72cb2898f3dab6c4489d3a1285f97", "parents": [ "0bf31aeb5b0e58cd167aaee2a6cb4d9248e0e66b", "de5c4c4671f63457151fce7b4ad7963518f8ce36" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 16:40:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:40:44 2015 +0000" }, "message": "am de5c4c46: am 43131299: am 1a09d352: Merge \"libstagefright: check remaining data size before parsing it.\" into klp-dev\n\n* commit \u0027de5c4c4671f63457151fce7b4ad7963518f8ce36\u0027:\n libstagefright: check remaining data size before parsing it.\n" }, { "commit": "0bf31aeb5b0e58cd167aaee2a6cb4d9248e0e66b", "tree": "04346208b53205c4cad6bfeb286d3bfd55a31ade", "parents": [ "0a427176083f5b82f4c47031fbc51dd1801121da", "9359e82213e6027b2390b76ba30e2e44f0d5cec6" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:40:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:40:43 2015 +0000" }, "message": "am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\n* commit \u00279359e82213e6027b2390b76ba30e2e44f0d5cec6\u0027:\n Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n" }, { "commit": "0a427176083f5b82f4c47031fbc51dd1801121da", "tree": "489211d95a97da04662d094e6df5872d5dd0ecb4", "parents": [ "fecbc5da64a992f91f74ef6c67a7e247b0da7777", "d3b0f865dcf66dfdf89e7e4d296e4a432a2e8a16" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 16:40:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:40:43 2015 +0000" }, "message": "am d3b0f865: am ce380290: (-s ours) am 567b6551: Merge \"SoftAVCEnc: check requested memory size before allocation.\" into klp-dev\n\n* commit \u0027d3b0f865dcf66dfdf89e7e4d296e4a432a2e8a16\u0027:\n SoftAVCEnc: check requested memory size before allocation.\n" }, { "commit": "a1e462e5531db20d1dc70c3e24c82879a0a90870", "tree": "490fd984b4ee20b95259e6bdc9f514941a703b81", "parents": [ "5ff4bb7a65f0495c2cd79413ef3001b208ae7e2c", "0afecdebaea1982ead120a701ddd24f2b0ff3897" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 16:33:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:33:55 2015 +0000" }, "message": "am 0afecdeb: am aa1cc741: Merge \"Check buffer size before using it\" into klp-dev\n\n* commit \u00270afecdebaea1982ead120a701ddd24f2b0ff3897\u0027:\n Check buffer size before using it\n" }, { "commit": "5ff4bb7a65f0495c2cd79413ef3001b208ae7e2c", "tree": "8aaaf7a1f0b4170e32c60a0c87c6d2c16870c6fe", "parents": [ "3b77e940822e8a5ef4953b709bdae00fa1bcca43", "8026ad3838e2f7367e8ff616f66b2c2f8bc8488c" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:33:50 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:33:50 2015 +0000" }, "message": "am 8026ad38: am 6efa86be: Merge \"Check vector size before accessing\" into klp-dev\n\n* commit \u00278026ad3838e2f7367e8ff616f66b2c2f8bc8488c\u0027:\n Check vector size before accessing\n" }, { "commit": "3b77e940822e8a5ef4953b709bdae00fa1bcca43", "tree": "3eafd348c58b70c0e73b752a345877d8956fe999", "parents": [ "e9a8362e1d379e90655e904ca49d6333e4218eda", "d146d4660451fb04c039f4ac8554103876fa4722" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:33:49 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:33:49 2015 +0000" }, "message": "am d146d466: am 6f561b93: Merge \"MatroskaExtractor: detect infinite loop when parsing NALs\" into klp-dev\n\n* commit \u0027d146d4660451fb04c039f4ac8554103876fa4722\u0027:\n MatroskaExtractor: detect infinite loop when parsing NALs\n" }, { "commit": "e9a8362e1d379e90655e904ca49d6333e4218eda", "tree": "06045d952b339d8891f04c94a25a9ff701aa83ce", "parents": [ "6afd8574d44ae158bed9cafe1c74dd1bfc5573b6", "a2a6826494dec4a8fab6bd6828828fae886e516a" ], "author": { "name": "Neel Mehta", "email": "nmehta@google.com", "time": "Tue Aug 18 16:33:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:33:48 2015 +0000" }, "message": "am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354\n\n* commit \u0027a2a6826494dec4a8fab6bd6828828fae886e516a\u0027:\n Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354\n" }, { "commit": "6afd8574d44ae158bed9cafe1c74dd1bfc5573b6", "tree": "a025fe57b1172ee87397f52df6a38e4040de6104", "parents": [ "01841c73a5a824a34d794ec69e2769b088306485", "073a656d7dd0b432e7c8d508745d9fb552955b9e" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:33:46 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:33:46 2015 +0000" }, "message": "am 073a656d: am deba0610: Merge \"Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\" into klp-dev\n\n* commit \u0027073a656d7dd0b432e7c8d508745d9fb552955b9e\u0027:\n Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\n" }, { "commit": "01841c73a5a824a34d794ec69e2769b088306485", "tree": "085a10208389439b2f0c0799ab45b09ddd0d5650", "parents": [ "de5c4c4671f63457151fce7b4ad7963518f8ce36", "af46239a10921980f5030222dff147a592480248" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:33:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:33:43 2015 +0000" }, "message": "am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\n* commit \u0027af46239a10921980f5030222dff147a592480248\u0027:\n Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n" }, { "commit": "de5c4c4671f63457151fce7b4ad7963518f8ce36", "tree": "73e9bdfee7dfcb46a5153179c59b2f407f9fb5ff", "parents": [ "9359e82213e6027b2390b76ba30e2e44f0d5cec6", "431312997856ce689e683ee0639cf1f4bedab7f0" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 16:33:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:33:38 2015 +0000" }, "message": "am 43131299: am 1a09d352: Merge \"libstagefright: check remaining data size before parsing it.\" into klp-dev\n\n* commit \u0027431312997856ce689e683ee0639cf1f4bedab7f0\u0027:\n libstagefright: check remaining data size before parsing it.\n" }, { "commit": "9359e82213e6027b2390b76ba30e2e44f0d5cec6", "tree": "f961ac67cfb2a22babfdb8da5e77b71b3a6b7516", "parents": [ "d3b0f865dcf66dfdf89e7e4d296e4a432a2e8a16", "8a34499ab9987d962040881b4c8d66b655f65ae0" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 16:33:35 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:33:35 2015 +0000" }, "message": "am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\n* commit \u00278a34499ab9987d962040881b4c8d66b655f65ae0\u0027:\n Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n" }, { "commit": "d3b0f865dcf66dfdf89e7e4d296e4a432a2e8a16", "tree": "8a40eafbb1aac6a7a2ca9021ce449a2203d0823e", "parents": [ "5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423", "ce3802906214ec1ae2ac78d765b8480a2ebe295a" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 16:33:34 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 16:33:34 2015 +0000" }, "message": "am ce380290: (-s ours) am 567b6551: Merge \"SoftAVCEnc: check requested memory size before allocation.\" into klp-dev\n\n* commit \u0027ce3802906214ec1ae2ac78d765b8480a2ebe295a\u0027:\n SoftAVCEnc: check requested memory size before allocation.\n" }, { "commit": "9707195bf18fed1318e5c747db82f9783262a137", "tree": "07c0fa83b4cbab8d9e04e79abeaa7695b7e5ebd5", "parents": [ "27362395cec5673a9cbfe7179ad5490c4e475329", "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:13:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 15:13:40 2015 +0000" }, "message": "am f97b6bee: Merge \"Check integer overflow to prevent memory corruption\" into klp-dev\n\n* commit \u0027f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a\u0027:\n Check integer overflow to prevent memory corruption\n" }, { "commit": "27362395cec5673a9cbfe7179ad5490c4e475329", "tree": "e157babb6cdfb2579d9382b2ce2db7da23908611", "parents": [ "6035c811849a8475697268cf71b5cf923705abe8", "2ed42aea9c6fbca4bde52d647ff082b997b5968c" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:13:39 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 15:13:39 2015 +0000" }, "message": "am 2ed42aea: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into klp-dev\n\n* commit \u00272ed42aea9c6fbca4bde52d647ff082b997b5968c\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "fecbc5da64a992f91f74ef6c67a7e247b0da7777", "tree": "489211d95a97da04662d094e6df5872d5dd0ecb4", "parents": [ "cad46fbde4961d5374c27f9d85cd8f2b6822ffa7", "5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:08:53 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 15:08:53 2015 +0000" }, "message": "am 5b4a5cce: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into lmp-dev\n\n* commit \u00275b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a", "tree": "cc19b2094c6e098fab0ad87d96662963024038f5", "parents": [ "2ed42aea9c6fbca4bde52d647ff082b997b5968c", "b158a9a5bcfe21480f57bc58d45517f1a81cca39" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:04:20 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 15:04:20 2015 +0000" }, "message": "Merge \"Check integer overflow to prevent memory corruption\" into klp-dev" }, { "commit": "5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423", "tree": "8a40eafbb1aac6a7a2ca9021ce449a2203d0823e", "parents": [ "f1a93e4720a71c308c3d88a9f751555ff532a01c", "bf47eb9c67ed364f3c288954857aab9d9311db4c" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:00:47 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 15:00:47 2015 +0000" }, "message": "Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into lmp-dev" }, { "commit": "2ed42aea9c6fbca4bde52d647ff082b997b5968c", "tree": "f9029c9705e97eb235c53ba8f9d29cfe87b0f8fa", "parents": [ "0d46c93785e2c426be11172bec0489b698fea6c3", "734e65e6e7e1ee863781c1ebd87003933bb4a752" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:00:42 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 15:00:42 2015 +0000" }, "message": "Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into klp-dev" }, { "commit": "cad46fbde4961d5374c27f9d85cd8f2b6822ffa7", "tree": "642e2b86313c7dad841e00b6f7186ee45f7a4b0d", "parents": [ "8369ac13ad207baebbaf4cd7b357a35dd54408c6", "f1a93e4720a71c308c3d88a9f751555ff532a01c" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:45:26 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 14:45:26 2015 +0000" }, "message": "am f1a93e47: Merge \"SoftOpus: Fix output buffer capacity.\" into lmp-dev\n\n* commit \u0027f1a93e4720a71c308c3d88a9f751555ff532a01c\u0027:\n SoftOpus: Fix output buffer capacity.\n" }, { "commit": "f1a93e4720a71c308c3d88a9f751555ff532a01c", "tree": "90678df609eb89b9eb418827534505a050c6e61f", "parents": [ "33235986a7490b569c859e5555328cbe1bae2748", "3179e3b3531b5fe93dc7f5b2c378e27010a406d5" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:37:32 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 14:37:32 2015 +0000" }, "message": "Merge \"SoftOpus: Fix output buffer capacity.\" into lmp-dev" }, { "commit": "6035c811849a8475697268cf71b5cf923705abe8", "tree": "b443bf98b8899119c9d7993a5340aa1c411bd083", "parents": [ "0afecdebaea1982ead120a701ddd24f2b0ff3897", "0d46c93785e2c426be11172bec0489b698fea6c3" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:31:25 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 14:31:25 2015 +0000" }, "message": "am 0d46c937: Merge \"MPEG4Source::fragmentedRead: check range before writing into buffers\" into klp-dev\n\n* commit \u00270d46c93785e2c426be11172bec0489b698fea6c3\u0027:\n MPEG4Source::fragmentedRead: check range before writing into buffers\n" }, { "commit": "0afecdebaea1982ead120a701ddd24f2b0ff3897", "tree": "223e4d668bbe88175f34d28aadf55200002901a5", "parents": [ "8026ad3838e2f7367e8ff616f66b2c2f8bc8488c", "aa1cc74139341eb3ae9511af5310b965dbf890f4" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:31:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 14:31:24 2015 +0000" }, "message": "am aa1cc741: Merge \"Check buffer size before using it\" into klp-dev\n\n* commit \u0027aa1cc74139341eb3ae9511af5310b965dbf890f4\u0027:\n Check buffer size before using it\n" }, { "commit": "0d46c93785e2c426be11172bec0489b698fea6c3", "tree": "d85768c73eae26399e188ee1fa069b7aac04c7ea", "parents": [ "aa1cc74139341eb3ae9511af5310b965dbf890f4", "f810a8298aea13fa177060cdc10c8297eac69c49" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:25:45 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 14:25:45 2015 +0000" }, "message": "Merge \"MPEG4Source::fragmentedRead: check range before writing into buffers\" into klp-dev" }, { "commit": "aa1cc74139341eb3ae9511af5310b965dbf890f4", "tree": "ad6d1edf7993e45e4aaa9c4412791cda0a192b07", "parents": [ "6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd", "f11e95b21007f24e5ab77298370855f9f085b2d7" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 14:24:26 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 14:24:26 2015 +0000" }, "message": "Merge \"Check buffer size before using it\" into klp-dev" }, { "commit": "8026ad3838e2f7367e8ff616f66b2c2f8bc8488c", "tree": "3747eda3e981b49ee24623909c9b4ceba0c2e656", "parents": [ "d146d4660451fb04c039f4ac8554103876fa4722", "6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:41:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 13:41:18 2015 +0000" }, "message": "am 6efa86be: Merge \"Check vector size before accessing\" into klp-dev\n\n* commit \u00276efa86beff54332cbf7bbd4949b0c38c1ec8c5cd\u0027:\n Check vector size before accessing\n" }, { "commit": "d146d4660451fb04c039f4ac8554103876fa4722", "tree": "86fa5fb0cd05e41c597a7b2700c5309be160cb49", "parents": [ "a2a6826494dec4a8fab6bd6828828fae886e516a", "6f561b93d8c6473fa0baa281ad4a53f882e656cc" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:36:34 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 13:36:34 2015 +0000" }, "message": "am 6f561b93: Merge \"MatroskaExtractor: detect infinite loop when parsing NALs\" into klp-dev\n\n* commit \u00276f561b93d8c6473fa0baa281ad4a53f882e656cc\u0027:\n MatroskaExtractor: detect infinite loop when parsing NALs\n" }, { "commit": "a2a6826494dec4a8fab6bd6828828fae886e516a", "tree": "3f90c877667c833507a014502693a0931f70ccbd", "parents": [ "073a656d7dd0b432e7c8d508745d9fb552955b9e", "c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b" ], "author": { "name": "Neel Mehta", "email": "nmehta@google.com", "time": "Tue Aug 18 13:36:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 13:36:33 2015 +0000" }, "message": "am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354\n\n* commit \u0027c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b\u0027:\n Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354\n" }, { "commit": "6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd", "tree": "c28630e1e229a01959f929c56894695525ff988d", "parents": [ "6f561b93d8c6473fa0baa281ad4a53f882e656cc", "073e4f6748f5d7deb095c42fad9271cb99e22d07" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:28:34 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 13:28:34 2015 +0000" }, "message": "Merge \"Check vector size before accessing\" into klp-dev" }, { "commit": "6f561b93d8c6473fa0baa281ad4a53f882e656cc", "tree": "6754377500a18f33e295c69bc0a46a9269e7d8c1", "parents": [ "c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b", "407d475b797fdc595299d67151230dc6e3835ccd" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:24:21 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 13:24:21 2015 +0000" }, "message": "Merge \"MatroskaExtractor: detect infinite loop when parsing NALs\" into klp-dev" }, { "commit": "8369ac13ad207baebbaf4cd7b357a35dd54408c6", "tree": "a8f1f3d6913f6dc4ff25366814f6348fcc8ea638", "parents": [ "ef2c6e044676bf9f0ead4359d7a1840236150e4d", "33235986a7490b569c859e5555328cbe1bae2748" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:14:57 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 13:14:57 2015 +0000" }, "message": "am 33235986: am 09c29ec4: am 94c1969c: Merge \"libstagefright: check memory size for overflow before allocation.\" into klp-dev\n\n* commit \u002733235986a7490b569c859e5555328cbe1bae2748\u0027:\n libstagefright: check memory size for overflow before allocation.\n" }, { "commit": "33235986a7490b569c859e5555328cbe1bae2748", "tree": "03ca69510524c0f5e94e3c0f45233c83879a0d25", "parents": [ "45e493e40ca5497cc7c21c3c683145d87bd37364", "09c29ec42df51ae807725d4eea52c4cc305c13a0" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 13:06:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 13:06:48 2015 +0000" }, "message": "am 09c29ec4: am 94c1969c: Merge \"libstagefright: check memory size for overflow before allocation.\" into klp-dev\n\n* commit \u002709c29ec42df51ae807725d4eea52c4cc305c13a0\u0027:\n libstagefright: check memory size for overflow before allocation.\n" }, { "commit": "ef2c6e044676bf9f0ead4359d7a1840236150e4d", "tree": "d44fefc54a5d761916d686a6b5889427065e5668", "parents": [ "5d1e62e24628e86fc0485113db18b31973a5cf4b", "45e493e40ca5497cc7c21c3c683145d87bd37364" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 13:04:50 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 13:04:50 2015 +0000" }, "message": "am 45e493e4: Merge \"Merge commit \\\u00275a289b87\\\u0027 into HEAD\" into lmp-dev\n\n* commit \u002745e493e40ca5497cc7c21c3c683145d87bd37364\u0027:\n ABuffer: reset members when memory allocation fails.\n" }, { "commit": "45e493e40ca5497cc7c21c3c683145d87bd37364", "tree": "b5ae8733c1c87200873460e477a6d1b24480dfa5", "parents": [ "9cebcc5f7992ded7fa686575914830b6554cd6c9", "dd7c0dd903ef6617d020c13f11b84996addff3c7" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 12:59:42 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 12:59:42 2015 +0000" }, "message": "Merge \"Merge commit \u00275a289b87\u0027 into HEAD\" into lmp-dev" }, { "commit": "407d475b797fdc595299d67151230dc6e3835ccd", "tree": "0924f43fb9ccf6ebbf227b9da67d74b570766307", "parents": [ "deba0610c89d54390c9d2d0a0f3b79fd7679779c" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jul 16 15:04:12 2015 -0700" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 02:33:07 2015 +0000" }, "message": "MatroskaExtractor: detect infinite loop when parsing NALs\n\nBug: 21335999\nChange-Id: I76bd34610e52048ffcf16e41aa6175afc8a14ee4\n(cherry picked from commit 2dcf6138ebc9c5688aeae151d2fbde55a2826128)\n" }, { "commit": "5d1e62e24628e86fc0485113db18b31973a5cf4b", "tree": "d76c9e840a384974039b625eaffceb5892bfd22c", "parents": [ "138f44a1de740fb6b3a3491c30a11dc8f6ca5f81", "9cebcc5f7992ded7fa686575914830b6554cd6c9" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 02:33:01 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 02:33:01 2015 +0000" }, "message": "am 9cebcc5f: Merge \"SoftAVCEncoder: fix mismatched type for comparison.\" into lmp-dev\n\n* commit \u00279cebcc5f7992ded7fa686575914830b6554cd6c9\u0027:\n SoftAVCEncoder: fix mismatched type for comparison.\n" }, { "commit": "9cebcc5f7992ded7fa686575914830b6554cd6c9", "tree": "5058913011bb9d70ba2f4d417c5b6d1753cd569b", "parents": [ "7d113a238871413e9bef15a2aa40731e56127a40", "38eff9af5c032bf12f89d6e94df05f65eef51afc" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 02:27:05 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 02:27:05 2015 +0000" }, "message": "Merge \"SoftAVCEncoder: fix mismatched type for comparison.\" into lmp-dev" }, { "commit": "dd7c0dd903ef6617d020c13f11b84996addff3c7", "tree": "8e4a5c8a490a473f46d6c6451de3dbe030cd6e84", "parents": [ "7d113a238871413e9bef15a2aa40731e56127a40", "5a289b87952f1cafbdcf604ad5e6da20403b38d5" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 17 19:18:24 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 17 19:18:24 2015 -0700" }, "message": "Merge commit \u00275a289b87\u0027 into HEAD\n\nABuffer: reset members when memory allocation fails.\n\nBug: 22077698\n(cherry picked from commit 94b0badc025b14141ff234e3e4e2745411742bac)\n\nChange-Id: I359ec16e524ffb298c143c3d72fbf1a3af72d663\n" }, { "commit": "c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b", "tree": "b29d7f3b35fcb42b4d696b2a1a68399e2758e52c", "parents": [ "deba0610c89d54390c9d2d0a0f3b79fd7679779c" ], "author": { "name": "Neel Mehta", "email": "nmehta@google.com", "time": "Fri Aug 14 17:38:48 2015 -0700" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 02:12:26 2015 +0000" }, "message": "Fix for memory corruption in ID3::removeUnsynchronizationV2_4().\nBug: 23227354\n\nChange-Id: Iaa36cfda4fd84ca7e039f56086fd61b4118020db\n(cherry picked from commit 77e23413a539df16503e356bd4df4a952f3abc47)\n" }, { "commit": "38eff9af5c032bf12f89d6e94df05f65eef51afc", "tree": "5058913011bb9d70ba2f4d417c5b6d1753cd569b", "parents": [ "90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 17 19:07:48 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 17 19:07:48 2015 -0700" }, "message": "SoftAVCEncoder: fix mismatched type for comparison.\n\nBug: 20674674\nChange-Id: Iace5b8c882339b3a9d2e706375255aeeeb0532fe\n" }, { "commit": "138f44a1de740fb6b3a3491c30a11dc8f6ca5f81", "tree": "6b0ae7687dd4ce0467ad8ec5b3bf272756674e14", "parents": [ "3175ff3f343ecd85700e2029d7709ce960272967", "7d113a238871413e9bef15a2aa40731e56127a40" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 01:59:47 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:59:47 2015 +0000" }, "message": "am 7d113a23: am 6d59c11c: (-s ours) am fc8c226b: Merge \"Revert \"SoftAVCEnc: check requested memory size before allocation.\"\" into klp-dev\n\n* commit \u00277d113a238871413e9bef15a2aa40731e56127a40\u0027:\n Revert \"SoftAVCEnc: check requested memory size before allocation.\"\n" }, { "commit": "7d113a238871413e9bef15a2aa40731e56127a40", "tree": "238c93c5793a752315de41882a69063fefb1207b", "parents": [ "90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d", "6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 01:53:08 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:53:08 2015 +0000" }, "message": "am 6d59c11c: (-s ours) am fc8c226b: Merge \"Revert \"SoftAVCEnc: check requested memory size before allocation.\"\" into klp-dev\n\n* commit \u00276d59c11c0dfa5aee2ebbadcf282b512cb55be9c2\u0027:\n Revert \"SoftAVCEnc: check requested memory size before allocation.\"\n" }, { "commit": "073a656d7dd0b432e7c8d508745d9fb552955b9e", "tree": "e869c8904fae46cd6a7624e01bb04b7a69f39e68", "parents": [ "af46239a10921980f5030222dff147a592480248", "deba0610c89d54390c9d2d0a0f3b79fd7679779c" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 01:45:49 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:45:49 2015 +0000" }, "message": "am deba0610: Merge \"Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\" into klp-dev\n\n* commit \u0027deba0610c89d54390c9d2d0a0f3b79fd7679779c\u0027:\n Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\n" }, { "commit": "af46239a10921980f5030222dff147a592480248", "tree": "008f1fc8ecebb7c0b1b6a1244c579d67ff38d3a8", "parents": [ "431312997856ce689e683ee0639cf1f4bedab7f0", "9abb7401df730b5c510f6b8dac2716a0928d9623" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 01:45:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:45:48 2015 +0000" }, "message": "am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\n* commit \u00279abb7401df730b5c510f6b8dac2716a0928d9623\u0027:\n Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n" }, { "commit": "3175ff3f343ecd85700e2029d7709ce960272967", "tree": "6b0ae7687dd4ce0467ad8ec5b3bf272756674e14", "parents": [ "78df80c26352bdbe3dc3725a6d937f60fc340127", "90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 01:39:06 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:39:06 2015 +0000" }, "message": "am 90eee339: am 652926c8: am 74d3170f: Merge \"Fix comparison sign warnings.\" into klp-dev\n\n* commit \u002790eee3397ad45bdae462f9f2ce0ef7d3b1e2957d\u0027:\n Fix comparison sign warnings.\n" }, { "commit": "90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d", "tree": "238c93c5793a752315de41882a69063fefb1207b", "parents": [ "65842db06c2d77e53cc5ac61692160d844cc7d0a", "652926c8a37fb904aaa0756a0d0bae0574f308c5" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 01:33:05 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:33:05 2015 +0000" }, "message": "am 652926c8: am 74d3170f: Merge \"Fix comparison sign warnings.\" into klp-dev\n\n* commit \u0027652926c8a37fb904aaa0756a0d0bae0574f308c5\u0027:\n Fix comparison sign warnings.\n" }, { "commit": "78df80c26352bdbe3dc3725a6d937f60fc340127", "tree": "f2341971131c08ee8463ab0b6278d938786aedec", "parents": [ "6faf46183099d4ed1a59daf6ae1490d3d891ada4", "65842db06c2d77e53cc5ac61692160d844cc7d0a" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 01:31:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:31:43 2015 +0000" }, "message": "am 65842db0: Merge commit \\\u0027b46eb8d9\\\u0027 into HEAD\n\n* commit \u002765842db06c2d77e53cc5ac61692160d844cc7d0a\u0027:\n SoftAVCEnc: check requested memory size before allocation.\n" }, { "commit": "deba0610c89d54390c9d2d0a0f3b79fd7679779c", "tree": "a483e8e26de32fe590d98811c3fa8e3aa37f6473", "parents": [ "9abb7401df730b5c510f6b8dac2716a0928d9623", "12bd1d2697f0d39f6c70f31d06f2f74c57e1d89f" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 01:31:42 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 01:31:42 2015 +0000" }, "message": "Merge \"Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\" into klp-dev" }, { "commit": "9abb7401df730b5c510f6b8dac2716a0928d9623", "tree": "5b02dde8e1c90ab3ecee53a26458b16bb28ae6bb", "parents": [ "1a09d3521e8849dcb1090ecb50393f6e9ee140ec" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Mon Aug 17 18:24:11 2015 -0700" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Mon Aug 17 18:24:11 2015 -0700" }, "message": "Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\nBug: 20674086\nChange-Id: I2ee6b7e0eabbf696c0986d08b2d759d48cb9eb7b\n" }, { "commit": "22ac20eff5b67f33b9d04ca54abeaa22ce201039", "tree": "e0fcb0e06bb14a3e9d34a514be6e912e6b6c8192", "parents": [ "1a09d3521e8849dcb1090ecb50393f6e9ee140ec" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 08 10:50:03 2015 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Aug 17 18:11:04 2015 -0700" }, "message": "DO NOT MERGE - audio flinger: fix fuzz test crash\n\nClear output stream pointer in duplicating thread\nwhen the main output to which it is attached is closed.\n\nAlso do not forward master mute and volume commands to\nduplicating threads as this is not applicable.\n\nAlso fix logic in AudioFlinger::primaryPlaybackThread_l()\nthat could accidentally return a duplicating thread.\nThis never happens because the primary thread is always\nfirst in the list.\n\nBug: 20731946.\nChange-Id: Ic8869699836920351b23d09544c50a258d3fb585\n" }, { "commit": "65842db06c2d77e53cc5ac61692160d844cc7d0a", "tree": "e0d37e05418a640e4a21472a0821c07518604b15", "parents": [ "e4ac35fa524b011f272d396b2c12515382bddb94", "b46eb8d9f8bff2e6ddec1902acc9d2ad65147d68" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 17 18:09:22 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 17 18:09:22 2015 -0700" }, "message": "Merge commit \u0027b46eb8d9\u0027 into HEAD\n\nSoftAVCEnc: check requested memory size before allocation.\n\nBug: 20674674\n(cherry picked from commit f6fe4340219a8e674f3250fe32d4697ec8184b24)\n\nChange-Id: Ib52a26de912fd5a9a08dd9948885fb4a9b32e9e6\n" }, { "commit": "431312997856ce689e683ee0639cf1f4bedab7f0", "tree": "71c10c9a85888d7446f53d5a4c35b6056a94c380", "parents": [ "8a34499ab9987d962040881b4c8d66b655f65ae0", "1a09d3521e8849dcb1090ecb50393f6e9ee140ec" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 01:00:53 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 01:00:53 2015 +0000" }, "message": "am 1a09d352: Merge \"libstagefright: check remaining data size before parsing it.\" into klp-dev\n\n* commit \u00271a09d3521e8849dcb1090ecb50393f6e9ee140ec\u0027:\n libstagefright: check remaining data size before parsing it.\n" }, { "commit": "8a34499ab9987d962040881b4c8d66b655f65ae0", "tree": "6eef5c0ccecd1da4a3a9f0fee7b9c451761f8af9", "parents": [ "ce3802906214ec1ae2ac78d765b8480a2ebe295a", "c23e3dd8af7397f023aae040c4a03dd14091cbed" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 00:53:14 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:14 2015 +0000" }, "message": "am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n\n* commit \u0027c23e3dd8af7397f023aae040c4a03dd14091cbed\u0027:\n Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\n" }, { "commit": "ce3802906214ec1ae2ac78d765b8480a2ebe295a", "tree": "91dcefa19420dc810d5313d70cd9981b3d1ac95e", "parents": [ "09c29ec42df51ae807725d4eea52c4cc305c13a0", "567b6551f8bc240cc267054ea5de55c46f10cc29" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:12 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:12 2015 +0000" }, "message": "am 567b6551: Merge \"SoftAVCEnc: check requested memory size before allocation.\" into klp-dev\n\n* commit \u0027567b6551f8bc240cc267054ea5de55c46f10cc29\u0027:\n SoftAVCEnc: check requested memory size before allocation.\n" }, { "commit": "09c29ec42df51ae807725d4eea52c4cc305c13a0", "tree": "c6e0949f6ad07dd9ca7b71f9ad611a13ea735f33", "parents": [ "5a289b87952f1cafbdcf604ad5e6da20403b38d5", "94c1969c38d4386933ed5cad7f625029442f6331" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Tue Aug 18 00:53:11 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:11 2015 +0000" }, "message": "am 94c1969c: Merge \"libstagefright: check memory size for overflow before allocation.\" into klp-dev\n\n* commit \u002794c1969c38d4386933ed5cad7f625029442f6331\u0027:\n libstagefright: check memory size for overflow before allocation.\n" }, { "commit": "5a289b87952f1cafbdcf604ad5e6da20403b38d5", "tree": "ad83f6152222eb3a63bd12a43d77ebc1e6220659", "parents": [ "6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2", "120f259d0de4dc048a2b9007c0f19b8808e59021" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:10 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:10 2015 +0000" }, "message": "am 120f259d: Merge \"ABuffer: reset members when memory allocation fails.\" into klp-dev\n\n* commit \u0027120f259d0de4dc048a2b9007c0f19b8808e59021\u0027:\n ABuffer: reset members when memory allocation fails.\n" }, { "commit": "6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2", "tree": "e5078ed566e1e69604ea697e55bc5b3dbe672799", "parents": [ "652926c8a37fb904aaa0756a0d0bae0574f308c5", "fc8c226b75a45876e6545c3a217698ada52bd2d6" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:09 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:09 2015 +0000" }, "message": "am fc8c226b: Merge \"Revert \"SoftAVCEnc: check requested memory size before allocation.\"\" into klp-dev\n\n* commit \u0027fc8c226b75a45876e6545c3a217698ada52bd2d6\u0027:\n Revert \"SoftAVCEnc: check requested memory size before allocation.\"\n" }, { "commit": "652926c8a37fb904aaa0756a0d0bae0574f308c5", "tree": "1323b1bde9c58a244c06669cfdb91d3dcc6f31c0", "parents": [ "b46eb8d9f8bff2e6ddec1902acc9d2ad65147d68", "74d3170ffc02620fcedb5a98c7a66e83ee2faa87" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:08 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:08 2015 +0000" }, "message": "am 74d3170f: Merge \"Fix comparison sign warnings.\" into klp-dev\n\n* commit \u002774d3170ffc02620fcedb5a98c7a66e83ee2faa87\u0027:\n Fix comparison sign warnings.\n" }, { "commit": "b46eb8d9f8bff2e6ddec1902acc9d2ad65147d68", "tree": "6af463d6368a2031a12873f8795d138160bf6a1d", "parents": [ "88aa97ea87b7e4f7b4f82df3500754e03205ef60", "479b4de0d267eb7d4c419f4da0069186a952ad17" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:53:07 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 00:53:07 2015 +0000" }, "message": "am 479b4de0: SoftAVCEnc: check requested memory size before allocation.\n\n* commit \u0027479b4de0d267eb7d4c419f4da0069186a952ad17\u0027:\n SoftAVCEnc: check requested memory size before allocation.\n" }, { "commit": "1a09d3521e8849dcb1090ecb50393f6e9ee140ec", "tree": "94569b4362815e1d20ffa4086499b9bc94f31d41", "parents": [ "c23e3dd8af7397f023aae040c4a03dd14091cbed", "d2ebc0b9e147f9406db20ec4df61da50e3614ee4" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 18 00:48:01 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 18 00:48:01 2015 +0000" }, "message": "Merge \"libstagefright: check remaining data size before parsing it.\" into klp-dev" }, { "commit": "12bd1d2697f0d39f6c70f31d06f2f74c57e1d89f", "tree": "4413ef2ffe6e19f0db0bf807666c5e60163c3965", "parents": [ "c23e3dd8af7397f023aae040c4a03dd14091cbed" ], "author": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Mon Aug 17 22:34:16 2015 +0000" }, "committer": { "name": "Abhishek Arya", "email": "aarya@google.com", "time": "Mon Aug 17 22:34:16 2015 +0000" }, "message": "Revert \"Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4\"\n\nThis reverts commit c23e3dd8af7397f023aae040c4a03dd14091cbed.\n\nThis speculative fix didn\u0027t fix the compile failure, do checking locally.\n\nChange-Id: I1598f7208c8232ca38c0fcad17f211598591594e\n" } ], "next": "f810a8298aea13fa177060cdc10c8297eac69c49" }