)]}' { "log": [ { "commit": "ed555d70d80964f40563d89a4e6d6a80f83f4b89", "tree": "5ba2d876caa6427dbc1ce3e3850b256d95ed797a", "parents": [ "39ff8149466ee8e86c0336f706cd4dd3713f359f" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 17 17:57:47 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Aug 17 17:57:47 2015 -0700" }, "message": "Part of fix for libmedia OOB write anywhere\n\nClarify that decrypt destination is not a pointer for\nsecure case.\n\nb/23223325\n\nChange-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac\n" }, { "commit": "39ff8149466ee8e86c0336f706cd4dd3713f359f", "tree": "2abf130bae4af4934fd5c35f63c4bdbfde39b076", "parents": [ "3bf1e0fdf27e1188b8d3574ed073595b8eacb114", "2c5fb0c7249ba7e5d79236c61a1c94a489041e65" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 17 20:59:03 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 17 20:59:03 2015 +0000" }, "message": "Merge \"libstagefright: fix possible overflow in SampleTable.cpp\" into mnc-dev" }, { "commit": "2c5fb0c7249ba7e5d79236c61a1c94a489041e65", "tree": "68a343d132f5be025e3c39065d0fb9a443da7cdd", "parents": [ "fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Aug 14 14:45:32 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 17 13:08:17 2015 -0700" }, "message": "libstagefright: fix possible overflow in SampleTable.cpp\n\nBug: 23197952\nChange-Id: I83afe5aad74a41102b127c4e46799ebc317cd96c\n" }, { "commit": "3bf1e0fdf27e1188b8d3574ed073595b8eacb114", "tree": "f6bd74544d3c09fd7047275b348d8a9095fbe47b", "parents": [ "4883125b0df72ee404de8b244c3e6511f62947ee" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Sun Aug 16 17:41:50 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Sun Aug 16 17:41:50 2015 -0700" }, "message": "libstagefright: check remaining data size before parsing it.\n\nBug: 23248776\nChange-Id: I45cf53e58e4375afcf260b122264c968ec0ff6c8\n" }, { "commit": "4883125b0df72ee404de8b244c3e6511f62947ee", "tree": "358b8cb0622b927674b413e0e07b7da6dd452e21", "parents": [ "bad4358c83c7daaf9eeb8542c15eea4f473c884c", "a89cfb6cab17700efa62665cda3bc4b87c6f1ad8" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Sat Aug 15 01:01:09 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 15 01:01:09 2015 +0000" }, "message": "Merge \"do not dequeue from native window after we hit fatal error\" into mnc-dev" }, { "commit": "bad4358c83c7daaf9eeb8542c15eea4f473c884c", "tree": "0b01065e69f769a7dc058b8ac6652ef93d4736ed", "parents": [ "49f0246c2eac50bbfebf48316b1086de64ac9860" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 14 13:12:32 2015 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 14 16:02:03 2015 -0700" }, "message": "Camera: Add camera type to ICameraService.getNumberOfCameras.\n\nAlso determine the number of \u0027normal\u0027 cameras present on\ncamera service startup, and ensure that all normal cameras have\nIDs lower than the \u0027strange\u0027 cameras.\n\nBug: 23194168\nChange-Id: I1f7b14825cb52707de698a955f85da1eaa932663\n" }, { "commit": "a89cfb6cab17700efa62665cda3bc4b87c6f1ad8", "tree": "397cbabac6f864c1c8841d584ad08d4261a73795", "parents": [ "49f0246c2eac50bbfebf48316b1086de64ac9860" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 14 13:50:02 2015 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 14 21:59:17 2015 +0000" }, "message": "do not dequeue from native window after we hit fatal error\n\nbug: 22845824\nChange-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141\n(cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)\n" }, { "commit": "49f0246c2eac50bbfebf48316b1086de64ac9860", "tree": "b2f5d5d8e4e9dee580233670912530da2b028ac0", "parents": [ "3ba0c6ec009aa675d3433cd6c12af173874787bd", "d6d7296d01e7b72f7212837e2158e4c77d145fbe" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 23:13:03 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 23:13:03 2015 +0000" }, "message": "am d6d7296d: (-s ours) am 880323a2: am 2c0adb69: am 6faf4618: am e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls\n\n* commit \u0027d6d7296d01e7b72f7212837e2158e4c77d145fbe\u0027:\n DO NOT MERGE - IAudioFlinger: add checks on binder calls\n" }, { "commit": "d6d7296d01e7b72f7212837e2158e4c77d145fbe", "tree": "d69a91ab28e658037247a852a7e7c8d614caaeae", "parents": [ "b9b2eee2e2457d57d97a74bf34285842477382f5", "880323a217367bd0304fef7113623a9407dce106" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 23:06:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 23:06:55 2015 +0000" }, "message": "am 880323a2: am 2c0adb69: am 6faf4618: am e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls\n\n* commit \u0027880323a217367bd0304fef7113623a9407dce106\u0027:\n DO NOT MERGE - IAudioFlinger: add checks on binder calls\n" }, { "commit": "3ba0c6ec009aa675d3433cd6c12af173874787bd", "tree": "b2f5d5d8e4e9dee580233670912530da2b028ac0", "parents": [ "a45ccfb88f043f859f9674b8d78b0c3e93328d10", "183f056393423b344e73f388f21d30379a38e519" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Thu Aug 13 22:59:35 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 13 22:59:35 2015 +0000" }, "message": "Merge \"Fix deadlock conditions in Camera3Device.\" into mnc-dev" }, { "commit": "880323a217367bd0304fef7113623a9407dce106", "tree": "2f268164f1b40997853d00c8d197b73c2403e8c6", "parents": [ "f311db04e72f66cb5b31d44e8780a1fcb88b3cdd", "2c0adb690ad2057d753a1d6892e9534e1648651b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 22:59:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 22:59:24 2015 +0000" }, "message": "am 2c0adb69: am 6faf4618: am e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls\n\n* commit \u00272c0adb690ad2057d753a1d6892e9534e1648651b\u0027:\n DO NOT MERGE - IAudioFlinger: add checks on binder calls\n" }, { "commit": "a45ccfb88f043f859f9674b8d78b0c3e93328d10", "tree": "eed57eab507bc0dd965cd9c127a16c16307a178c", "parents": [ "14cf4f0f1c448cfdb2c460d6ca181c5975b961e7", "b9b2eee2e2457d57d97a74bf34285842477382f5" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 22:56:46 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 22:56:46 2015 +0000" }, "message": "am b9b2eee2: (-s ours) am f311db04: am 2517d62a: Merge \"DO NOT MERGE - IAudioFlinger: add checks on binder calls\" into lmp-mr1-dev\n\n* commit \u0027b9b2eee2e2457d57d97a74bf34285842477382f5\u0027:\n DO NOT MERGE - IAudioFlinger: add checks on binder calls\n" }, { "commit": "2c0adb690ad2057d753a1d6892e9534e1648651b", "tree": "2f268164f1b40997853d00c8d197b73c2403e8c6", "parents": [ "2517d62a1c888332e7407295f935c4a55361db3a", "6faf46183099d4ed1a59daf6ae1490d3d891ada4" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 22:54:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 22:54:00 2015 +0000" }, "message": "am 6faf4618: am e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls\n\n* commit \u00276faf46183099d4ed1a59daf6ae1490d3d891ada4\u0027:\n DO NOT MERGE - IAudioFlinger: add checks on binder calls\n" }, { "commit": "b9b2eee2e2457d57d97a74bf34285842477382f5", "tree": "d69a91ab28e658037247a852a7e7c8d614caaeae", "parents": [ "c7a58efaa8276036ae307a16bc9ee2411926ff9e", "f311db04e72f66cb5b31d44e8780a1fcb88b3cdd" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 22:52:19 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 22:52:19 2015 +0000" }, "message": "am f311db04: am 2517d62a: Merge \"DO NOT MERGE - IAudioFlinger: add checks on binder calls\" into lmp-mr1-dev\n\n* commit \u0027f311db04e72f66cb5b31d44e8780a1fcb88b3cdd\u0027:\n DO NOT MERGE - IAudioFlinger: add checks on binder calls\n" }, { "commit": "6faf46183099d4ed1a59daf6ae1490d3d891ada4", "tree": "5a2e7b9479c92d49de03b688cf39997cd3e2578c", "parents": [ "84a131f227398bd217f9c4ce91ff6fec13b29df4", "e4ac35fa524b011f272d396b2c12515382bddb94" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 22:46:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 22:46:29 2015 +0000" }, "message": "am e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls\n\n* commit \u0027e4ac35fa524b011f272d396b2c12515382bddb94\u0027:\n DO NOT MERGE - IAudioFlinger: add checks on binder calls\n" }, { "commit": "f311db04e72f66cb5b31d44e8780a1fcb88b3cdd", "tree": "2f268164f1b40997853d00c8d197b73c2403e8c6", "parents": [ "def6aff8b8d9e38019f5fc0dccf9c24f48ad4d4a", "2517d62a1c888332e7407295f935c4a55361db3a" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 22:45:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 22:45:33 2015 +0000" }, "message": "am 2517d62a: Merge \"DO NOT MERGE - IAudioFlinger: add checks on binder calls\" into lmp-mr1-dev\n\n* commit \u00272517d62a1c888332e7407295f935c4a55361db3a\u0027:\n DO NOT MERGE - IAudioFlinger: add checks on binder calls\n" }, { "commit": "2517d62a1c888332e7407295f935c4a55361db3a", "tree": "2f268164f1b40997853d00c8d197b73c2403e8c6", "parents": [ "1c4549c38b7056ae6a4415eb65123d23d86c7b97", "9ef830c6dbd4f6000b94abee3df14b9e27a38294" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 22:40:25 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 13 22:40:25 2015 +0000" }, "message": "Merge \"DO NOT MERGE - IAudioFlinger: add checks on binder calls\" into lmp-mr1-dev" }, { "commit": "e4ac35fa524b011f272d396b2c12515382bddb94", "tree": "4ebbce6415c6ad94a2fe021b652e4ae3dced8e0d", "parents": [ "39ab7cea0e3c14181e3e68b0f1bb5fa20a434b35" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Apr 02 13:49:15 2015 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Aug 13 22:10:46 2015 +0000" }, "message": "DO NOT MERGE - IAudioFlinger: add checks on binder calls\n\nLimit number of ports and patches listed by\nLIST_AUDIO_PATCHES and LIST_AUDIO_PORTS.\n\nAlso fix typo causing wrong pointer to be used when writing to Parcel.\n\nBug: 19573085.\nChange-Id: I41a9c710e45738a4f11990160587856c429a4646\n(cherry picked from commit f75c2fef14354024ec27bff1444f9e50b5ef55a9)\n" }, { "commit": "14cf4f0f1c448cfdb2c460d6ca181c5975b961e7", "tree": "eed57eab507bc0dd965cd9c127a16c16307a178c", "parents": [ "fe65140b164e177e8d512dfc290e86e73c02c2aa", "c7a58efaa8276036ae307a16bc9ee2411926ff9e" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 18:49:53 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 18:49:53 2015 +0000" }, "message": "am c7a58efa: am def6aff8: am 1c4549c3: am 84a131f2: am 39ab7cea: am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc.\n\n* commit \u0027c7a58efaa8276036ae307a16bc9ee2411926ff9e\u0027:\n libstagefright: fix possible overflow in amrwbenc.\n" }, { "commit": "c7a58efaa8276036ae307a16bc9ee2411926ff9e", "tree": "93aa0584c007224d43f340ecc5f804621292db40", "parents": [ "59a385e41be35b25422bbdf27ba5f3f894081671", "def6aff8b8d9e38019f5fc0dccf9c24f48ad4d4a" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 18:46:45 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 18:46:45 2015 +0000" }, "message": "am def6aff8: am 1c4549c3: am 84a131f2: am 39ab7cea: am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc.\n\n* commit \u0027def6aff8b8d9e38019f5fc0dccf9c24f48ad4d4a\u0027:\n libstagefright: fix possible overflow in amrwbenc.\n" }, { "commit": "def6aff8b8d9e38019f5fc0dccf9c24f48ad4d4a", "tree": "7a3869bd036ef451b226cd98684004d556428528", "parents": [ "f66b81e7c05f62105e7a8deefeaf395b28cb4bb3", "1c4549c38b7056ae6a4415eb65123d23d86c7b97" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 18:42:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 18:42:27 2015 +0000" }, "message": "am 1c4549c3: am 84a131f2: am 39ab7cea: am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc.\n\n* commit \u00271c4549c38b7056ae6a4415eb65123d23d86c7b97\u0027:\n libstagefright: fix possible overflow in amrwbenc.\n" }, { "commit": "1c4549c38b7056ae6a4415eb65123d23d86c7b97", "tree": "7a3869bd036ef451b226cd98684004d556428528", "parents": [ "f22da1cf931bb9ae5d964106a138672ebb04fc02", "84a131f227398bd217f9c4ce91ff6fec13b29df4" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 18:31:15 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 18:31:15 2015 +0000" }, "message": "am 84a131f2: am 39ab7cea: am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc.\n\n* commit \u002784a131f227398bd217f9c4ce91ff6fec13b29df4\u0027:\n libstagefright: fix possible overflow in amrwbenc.\n" }, { "commit": "84a131f227398bd217f9c4ce91ff6fec13b29df4", "tree": "c3d529d9ca86617759e8d50f5d4b81631ce566c3", "parents": [ "d7146ce70c892e65ff3aa38af3d0afc18d49dd8c", "39ab7cea0e3c14181e3e68b0f1bb5fa20a434b35" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 18:21:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 18:21:40 2015 +0000" }, "message": "am 39ab7cea: am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc.\n\n* commit \u002739ab7cea0e3c14181e3e68b0f1bb5fa20a434b35\u0027:\n libstagefright: fix possible overflow in amrwbenc.\n" }, { "commit": "39ab7cea0e3c14181e3e68b0f1bb5fa20a434b35", "tree": "ed3935a155767bd643a1f0b4d1ab5d576d2cb0c4", "parents": [ "3bb658acd971414b15b0957e131294db33f7b75b", "88aa97ea87b7e4f7b4f82df3500754e03205ef60" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 18:14:57 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 18:14:57 2015 +0000" }, "message": "am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc.\n\n* commit \u002788aa97ea87b7e4f7b4f82df3500754e03205ef60\u0027:\n libstagefright: fix possible overflow in amrwbenc.\n" }, { "commit": "88aa97ea87b7e4f7b4f82df3500754e03205ef60", "tree": "5da443ca6f2fba132307e3a05e13c4ac45263128", "parents": [ "4e86a483a12b0139a8babf4754e5de340eaccd40", "3ce293842fed1b3abd2ff0aecd2a0c70a55086ee" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 18:08:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 18:08:00 2015 +0000" }, "message": "am 3ce29384: libstagefright: fix possible overflow in amrwbenc.\n\n* commit \u00273ce293842fed1b3abd2ff0aecd2a0c70a55086ee\u0027:\n libstagefright: fix possible overflow in amrwbenc.\n" }, { "commit": "fe65140b164e177e8d512dfc290e86e73c02c2aa", "tree": "eed57eab507bc0dd965cd9c127a16c16307a178c", "parents": [ "bb37e84f8d45c34ec86485632e861914ac0473a0", "59a385e41be35b25422bbdf27ba5f3f894081671" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 17:20:23 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 17:20:23 2015 +0000" }, "message": "am 59a385e4: am f66b81e7: am f22da1cf: am d7146ce7: am 3bb658ac: am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.\n\n* commit \u002759a385e41be35b25422bbdf27ba5f3f894081671\u0027:\n libstagefright: fix possible overflow in ID3.\n" }, { "commit": "59a385e41be35b25422bbdf27ba5f3f894081671", "tree": "07444ef594805aa8e3a4b8ca878d7626e59e5fe4", "parents": [ "b07c4a8d7f6c0ce52e5c63142e39e8c39fcaee35", "f66b81e7c05f62105e7a8deefeaf395b28cb4bb3" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 17:16:09 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 17:16:09 2015 +0000" }, "message": "am f66b81e7: am f22da1cf: am d7146ce7: am 3bb658ac: am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.\n\n* commit \u0027f66b81e7c05f62105e7a8deefeaf395b28cb4bb3\u0027:\n libstagefright: fix possible overflow in ID3.\n" }, { "commit": "f66b81e7c05f62105e7a8deefeaf395b28cb4bb3", "tree": "eb3b056051d4aee682ae9ca7dd7768c2dc6529a5", "parents": [ "f86b266c14d61887b91ba4cfd5e9531877ee455a", "f22da1cf931bb9ae5d964106a138672ebb04fc02" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 17:07:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 17:07:48 2015 +0000" }, "message": "am f22da1cf: am d7146ce7: am 3bb658ac: am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.\n\n* commit \u0027f22da1cf931bb9ae5d964106a138672ebb04fc02\u0027:\n libstagefright: fix possible overflow in ID3.\n" }, { "commit": "f22da1cf931bb9ae5d964106a138672ebb04fc02", "tree": "eb3b056051d4aee682ae9ca7dd7768c2dc6529a5", "parents": [ "2c181bec9c781e7e50d99fb4e3b981b3d0a756f3", "d7146ce70c892e65ff3aa38af3d0afc18d49dd8c" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 17:00:59 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 17:00:59 2015 +0000" }, "message": "am d7146ce7: am 3bb658ac: am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.\n\n* commit \u0027d7146ce70c892e65ff3aa38af3d0afc18d49dd8c\u0027:\n libstagefright: fix possible overflow in ID3.\n" }, { "commit": "d7146ce70c892e65ff3aa38af3d0afc18d49dd8c", "tree": "2c4d4a3a6f63367a1ce01950e22587f02f2f43a3", "parents": [ "7f6a36d20afb6383e5e46cdfa4a9e056c99c18e8", "3bb658acd971414b15b0957e131294db33f7b75b" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 16:50:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 16:50:55 2015 +0000" }, "message": "am 3bb658ac: am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.\n\n* commit \u00273bb658acd971414b15b0957e131294db33f7b75b\u0027:\n libstagefright: fix possible overflow in ID3.\n" }, { "commit": "3ce293842fed1b3abd2ff0aecd2a0c70a55086ee", "tree": "f593018b43c0bedfbb8c578b7b0d7fc8b9536121", "parents": [ "f51115bd8e44c2779b74477277c6f6046916e7cf" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 12 10:08:41 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 16:49:35 2015 +0000" }, "message": "libstagefright: fix possible overflow in amrwbenc.\n\nBug: 23142203\nChange-Id: I309df51e4df6412655f04cc093d792bf6c7944f7\n(cherry picked from commit 9dd01777aa14bbb90a6cdccf97383bb4e3d717a5)\n" }, { "commit": "3bb658acd971414b15b0957e131294db33f7b75b", "tree": "4089efba56d8cf5d2c86de02f1097743e6168fc3", "parents": [ "b6131acd69ea32df926125d94c16174bc0ce1d4a", "4e86a483a12b0139a8babf4754e5de340eaccd40" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 16:42:54 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 16:42:54 2015 +0000" }, "message": "am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.\n\n* commit \u00274e86a483a12b0139a8babf4754e5de340eaccd40\u0027:\n libstagefright: fix possible overflow in ID3.\n" }, { "commit": "4e86a483a12b0139a8babf4754e5de340eaccd40", "tree": "c150a9da143c2d9ee427ef803bcf4218e90ca508", "parents": [ "94f8150be2041f73c2f185f2c3622a9537d47454", "f51115bd8e44c2779b74477277c6f6046916e7cf" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 16:34:17 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 13 16:34:17 2015 +0000" }, "message": "am f51115bd: libstagefright: fix possible overflow in ID3.\n\n* commit \u0027f51115bd8e44c2779b74477277c6f6046916e7cf\u0027:\n libstagefright: fix possible overflow in ID3.\n" }, { "commit": "bb37e84f8d45c34ec86485632e861914ac0473a0", "tree": "eed57eab507bc0dd965cd9c127a16c16307a178c", "parents": [ "5732386666aa2265d658e9fc861a1dfe22033861", "9dd01777aa14bbb90a6cdccf97383bb4e3d717a5" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Aug 13 02:45:16 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 13 02:45:16 2015 +0000" }, "message": "Merge \"libstagefright: fix possible overflow in amrwbenc.\" into mnc-dev" }, { "commit": "5732386666aa2265d658e9fc861a1dfe22033861", "tree": "1ba35271c05fcf3790f7216ff625c1e00df81c12", "parents": [ "4327df2af078894c38a8eb69f4873bef92cc0f83", "c96ac8dfcae66a45b7ae67b82dabdf19f60f859d" ], "author": { "name": "Chien-Yu Chen", "email": "cychen@google.com", "time": "Thu Aug 13 00:55:24 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 13 00:55:24 2015 +0000" }, "message": "Merge \"Camera3Device: Relax InFlightMap size check\" into mnc-dev" }, { "commit": "c96ac8dfcae66a45b7ae67b82dabdf19f60f859d", "tree": "e6c6e01b854fc40c4f66805df6c661b41c5b034c", "parents": [ "09da86913ca97d7a818a8917b6601527e5e18a24" ], "author": { "name": "Chien-Yu Chen", "email": "cychen@google.com", "time": "Wed Aug 12 16:46:24 2015 -0700" }, "committer": { "name": "Chien-Yu Chen", "email": "cychen@google.com", "time": "Wed Aug 12 17:31:03 2015 -0700" }, "message": "Camera3Device: Relax InFlightMap size check\n\nRelax InFlightMap size check for high speed configurations to\nallow more pending capture requests.\n\nBug: 23162274\nChange-Id: I955fe9a0754f0daed001f4a2b34ccb50f2465a11\n" }, { "commit": "9dd01777aa14bbb90a6cdccf97383bb4e3d717a5", "tree": "3e7efecf65aff876c18be162d8a94fd16cc97708", "parents": [ "fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 12 10:08:41 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 12 15:33:53 2015 -0700" }, "message": "libstagefright: fix possible overflow in amrwbenc.\n\nBug: 23142203\nChange-Id: I309df51e4df6412655f04cc093d792bf6c7944f7\n" }, { "commit": "183f056393423b344e73f388f21d30379a38e519", "tree": "a3ea7463340322257cc66457f66d43532cd6a0be", "parents": [ "4327df2af078894c38a8eb69f4873bef92cc0f83" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Wed Aug 12 12:55:02 2015 -0700" }, "committer": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Wed Aug 12 14:13:16 2015 -0700" }, "message": "Fix deadlock conditions in Camera3Device.\n\nPotential deadlock conditions this addresses, include:\n- Not waking up waiting threads for several situations where\n the status had been updated.\n- Not waking up all waiting thread when status had been updated\n (only one thread was awoken due to use of signal).\n- Threads clear status transitions before other waiting threads\n have a chance to examine them.\n\nBug: 22448586\nChange-Id: I53ba669d333a83d2bfa1ca3170d34acc6d8fe6e3\n" }, { "commit": "4327df2af078894c38a8eb69f4873bef92cc0f83", "tree": "66c04d0f4ab1a8cb81bb9a9410b780ad44a5f14d", "parents": [ "09da86913ca97d7a818a8917b6601527e5e18a24", "95a1d0f2fb1ea85c549ef8b869ab9ab52601d1db" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Aug 12 20:01:43 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 12 20:01:43 2015 +0000" }, "message": "Merge \"Camera: Allocate correctly-sized buffers for DEPTH_POINT_CLOUD\" into mnc-dev" }, { "commit": "f51115bd8e44c2779b74477277c6f6046916e7cf", "tree": "a178d186a3a2c95529c24ddc35f02307a8c0d7e3", "parents": [ "c86eae32ebb0cc580a13dde30fe765a96b8e701c" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 12 10:41:00 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 12 18:51:25 2015 +0000" }, "message": "libstagefright: fix possible overflow in ID3.\n\nBug: 23129786\nChange-Id: I2e6b7a6927aa4362ab49dd6824bbb1abf7b4e661\n(cherry picked from commit 09da86913ca97d7a818a8917b6601527e5e18a24)\n" }, { "commit": "09da86913ca97d7a818a8917b6601527e5e18a24", "tree": "e05c3edd5dabc35386c3415d9638b9d09169fc8c", "parents": [ "fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 12 10:41:00 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Aug 12 10:41:00 2015 -0700" }, "message": "libstagefright: fix possible overflow in ID3.\n\nBug: 23129786\nChange-Id: I2e6b7a6927aa4362ab49dd6824bbb1abf7b4e661\n" }, { "commit": "fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d", "tree": "d4cedfd6eb5ec89beec9379ba43f76e80ac8c4d2", "parents": [ "123e0f44f725d8fdb13bf6db2aacb91492e2ca7e" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Aug 11 15:52:26 2015 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Aug 11 15:55:02 2015 -0700" }, "message": "Check integer overflow to prevent memory corruption\n\nbug: 23016072\nChange-Id: If3c9a835408773847c0024a812bd8b4915ebd680\n" }, { "commit": "95a1d0f2fb1ea85c549ef8b869ab9ab52601d1db", "tree": "588303955754f420083abf393acc61de98c7e7b8", "parents": [ "9872cdceaf76727e9ccc353ee41957b957b76566" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Aug 11 15:08:53 2015 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Aug 11 15:08:53 2015 -0700" }, "message": "Camera: Allocate correctly-sized buffers for DEPTH_POINT_CLOUD\n\nBug: 20537722\nChange-Id: I9fa2fcdcfd41cd3370732c70414914993d3dc94e\n" }, { "commit": "123e0f44f725d8fdb13bf6db2aacb91492e2ca7e", "tree": "b7c3f028d0af18caaa8c0cfba2d3165284645ba0", "parents": [ "c94caa14f8acb9f2f1010c34e7a40a51bf17b63b", "82db269d4797cb9909988b723d91fa2094a74b38" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Aug 11 17:55:13 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 11 17:55:13 2015 +0000" }, "message": "Merge \"audio policy: protect capture from telephony RX path.\" into mnc-dev" }, { "commit": "c94caa14f8acb9f2f1010c34e7a40a51bf17b63b", "tree": "88c67d2b853aea7f799a95255013fc925bbc54b6", "parents": [ "9195d57f3e6cf5339531944469293e1188a7947f", "b07c4a8d7f6c0ce52e5c63142e39e8c39fcaee35" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 05:39:22 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 05:39:22 2015 +0000" }, "message": "am b07c4a8d: am f86b266c: am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev\n\n* commit \u0027b07c4a8d7f6c0ce52e5c63142e39e8c39fcaee35\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "b07c4a8d7f6c0ce52e5c63142e39e8c39fcaee35", "tree": "1a9c16f4f781850b3542ceeb354afad7ae649967", "parents": [ "5aa85d05aaeb5509597b7876942b6f5e543a451c", "f86b266c14d61887b91ba4cfd5e9531877ee455a" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 05:33:04 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 05:33:04 2015 +0000" }, "message": "am f86b266c: am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev\n\n* commit \u0027f86b266c14d61887b91ba4cfd5e9531877ee455a\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "f86b266c14d61887b91ba4cfd5e9531877ee455a", "tree": "2318cdcbf017510f913834c22623a7a6a7878f57", "parents": [ "74cda34ac909eb713cec22bebb08ecaeefd8f7dd", "2c181bec9c781e7e50d99fb4e3b981b3d0a756f3" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 05:25:13 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 05:25:13 2015 +0000" }, "message": "am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev\n\n* commit \u00272c181bec9c781e7e50d99fb4e3b981b3d0a756f3\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "2c181bec9c781e7e50d99fb4e3b981b3d0a756f3", "tree": "2318cdcbf017510f913834c22623a7a6a7878f57", "parents": [ "41d93c2f0a744fc6cd1aafce9a0eef57355bbf0f", "7f6a36d20afb6383e5e46cdfa4a9e056c99c18e8" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 05:19:26 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 05:19:26 2015 +0000" }, "message": "am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev\n\n* commit \u00277f6a36d20afb6383e5e46cdfa4a9e056c99c18e8\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "7f6a36d20afb6383e5e46cdfa4a9e056c99c18e8", "tree": "58d662fb505e40bc0af516d2e85882d14650d2e1", "parents": [ "c88ddfc09338969a4c8fc32be1d3dffb9022a237", "b6131acd69ea32df926125d94c16174bc0ce1d4a" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 05:11:59 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 05:11:59 2015 +0000" }, "message": "am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev\n\n* commit \u0027b6131acd69ea32df926125d94c16174bc0ce1d4a\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "b6131acd69ea32df926125d94c16174bc0ce1d4a", "tree": "c00bfb87c8de5f5cd05d7275fa8d14afc76b800d", "parents": [ "2abbc048837182bda04037f53309cde4c73f017d", "94f8150be2041f73c2f185f2c3622a9537d47454" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 05:04:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 05:04:40 2015 +0000" }, "message": "am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev\n\n* commit \u002794f8150be2041f73c2f185f2c3622a9537d47454\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "94f8150be2041f73c2f185f2c3622a9537d47454", "tree": "7999571769c7a72999b2889fdf5054fa8667aaab", "parents": [ "ba34c2ba414352ed0c1b9188f51c5445b04af2c6", "c86eae32ebb0cc580a13dde30fe765a96b8e701c" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Aug 10 21:24:54 2015 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Aug 10 21:24:54 2015 -0700" }, "message": "resolved conflicts for merge of c86eae32 to klp-modular-dev\n\nChange-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f\n" }, { "commit": "c86eae32ebb0cc580a13dde30fe765a96b8e701c", "tree": "4eb8a59bcab02baaaa47b5b057f2e21d41313df4", "parents": [ "f59348edfc54baa8f6e6532c6484656cf444d199", "9d9491f9fb83523cfe68f2aa26c14f72f70812fc" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 03:31:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 03:31:38 2015 +0000" }, "message": "am 9d9491f9: am 0dbd0d7b: am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev\n\n* commit \u00279d9491f9fb83523cfe68f2aa26c14f72f70812fc\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "9d9491f9fb83523cfe68f2aa26c14f72f70812fc", "tree": "f761d21bfae5e0e042ee41ae0fb43fc149850f07", "parents": [ "0080e03e2a69dcb5ecbcb2848f358ca73163714c", "0dbd0d7bfe340ac46271c7f87969431b62a023ed" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 03:24:13 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 03:24:13 2015 +0000" }, "message": "am 0dbd0d7b: am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev\n\n* commit \u00270dbd0d7bfe340ac46271c7f87969431b62a023ed\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "0dbd0d7bfe340ac46271c7f87969431b62a023ed", "tree": "62abbda0ae5ac64359add878f6adfbd59098b55e", "parents": [ "3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2", "c99244105803ac32f4cc698b5b2a85b225d925a2" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 03:07:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 03:07:29 2015 +0000" }, "message": "am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev\n\n* commit \u0027c99244105803ac32f4cc698b5b2a85b225d925a2\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "c99244105803ac32f4cc698b5b2a85b225d925a2", "tree": "cd0420fd98299cd64376820596f1c5dca9b0b343", "parents": [ "2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9", "2fe61ed032e083dc39265f3b88274fcb8fbeed9b" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 02:57:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 02:57:48 2015 +0000" }, "message": "am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev\n\n* commit \u00272fe61ed032e083dc39265f3b88274fcb8fbeed9b\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "2fe61ed032e083dc39265f3b88274fcb8fbeed9b", "tree": "8b598706e5a5dcd9b1444f99dcaf01440bc1a869", "parents": [ "fea5921b975cf43c88b8f93d4f2500abde6088be", "3b8d3fa0dd97c05f77c4686986812e40203678d2" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 02:49:10 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 02:49:10 2015 +0000" }, "message": "am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev\n\n* commit \u00273b8d3fa0dd97c05f77c4686986812e40203678d2\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "3b8d3fa0dd97c05f77c4686986812e40203678d2", "tree": "7197300b2129cfc3e7252d89d4347f24429cb659", "parents": [ "9fff1d37d6129dfce7a6f89004ec4a9cea9c9cad", "186d1fb9b72439c1c3317d72e4a0f52f466e6861" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 02:37:17 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 02:37:17 2015 +0000" }, "message": "am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev\n\n* commit \u0027186d1fb9b72439c1c3317d72e4a0f52f466e6861\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "186d1fb9b72439c1c3317d72e4a0f52f466e6861", "tree": "7197300b2129cfc3e7252d89d4347f24429cb659", "parents": [ "d9d35098aaaa546d79d0707734aac9b4b12c5be1", "f4dfe12ecd26e7d6965a2abc062709b6d7d942c4" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 02:32:49 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 02:32:49 2015 +0000" }, "message": "am f4dfe12e: am 54d88fe2: am aa8dab77: Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev\n\n* commit \u0027f4dfe12ecd26e7d6965a2abc062709b6d7d942c4\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "9195d57f3e6cf5339531944469293e1188a7947f", "tree": "88c67d2b853aea7f799a95255013fc925bbc54b6", "parents": [ "9872cdceaf76727e9ccc353ee41957b957b76566", "6b7d2ed40c4e7f7bac824c44795e2cd83459844c" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Aug 11 02:28:27 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 11 02:28:27 2015 +0000" }, "message": "Merge \"NuPlayer: set video surface directly when NuPlayer has not started yet.\" into mnc-dev" }, { "commit": "f4dfe12ecd26e7d6965a2abc062709b6d7d942c4", "tree": "7c015593efd599b76760fa685b3ef564306f6af0", "parents": [ "af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9", "54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 02:26:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 02:26:38 2015 +0000" }, "message": "am 54d88fe2: am aa8dab77: Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev\n\n* commit \u002754d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0", "tree": "38169e6c54e9769c02e415d640996542a386e819", "parents": [ "bce77a36125b25ce864b40bd5938ca89becea898", "aa8dab77aa9ef1bb6e5414ee5e773001de725bef" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Aug 11 02:20:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 11 02:20:00 2015 +0000" }, "message": "am aa8dab77: Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev\n\n* commit \u0027aa8dab77aa9ef1bb6e5414ee5e773001de725bef\u0027:\n MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\n" }, { "commit": "6b7d2ed40c4e7f7bac824c44795e2cd83459844c", "tree": "eefcfb24321cce42cb0f4f025513e3cde4757e20", "parents": [ "7db7948908b21ca2d878d6882cdf1a23a121182f" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 10 15:11:54 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Aug 10 15:53:57 2015 -0700" }, "message": "NuPlayer: set video surface directly when NuPlayer has not started yet.\n\nBug: 22119956\nChange-Id: Ie174f4fc495ab8418993ff7887aaa6ae721c6008\n" }, { "commit": "9872cdceaf76727e9ccc353ee41957b957b76566", "tree": "d574499c9a635e1532b339ba3d370bb3ba8ea2d8", "parents": [ "ab98ee22944857907cb4a2a32c43fb6a9e12f17f", "5aa85d05aaeb5509597b7876942b6f5e543a451c" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 17:40:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 17:40:40 2015 +0000" }, "message": "am 5aa85d05: am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u00275aa85d05aaeb5509597b7876942b6f5e543a451c\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "5aa85d05aaeb5509597b7876942b6f5e543a451c", "tree": "1a9c16f4f781850b3542ceeb354afad7ae649967", "parents": [ "f647c38a3e4b065fc26d0a8bb55071dae1028ac2", "74cda34ac909eb713cec22bebb08ecaeefd8f7dd" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 17:33:12 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 17:33:12 2015 +0000" }, "message": "am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u002774cda34ac909eb713cec22bebb08ecaeefd8f7dd\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "74cda34ac909eb713cec22bebb08ecaeefd8f7dd", "tree": "2318cdcbf017510f913834c22623a7a6a7878f57", "parents": [ "648ec9da3bcf1b9b47f2abf6bfcb2fdf54db7b09", "41d93c2f0a744fc6cd1aafce9a0eef57355bbf0f" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 17:27:59 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 17:27:59 2015 +0000" }, "message": "am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u002741d93c2f0a744fc6cd1aafce9a0eef57355bbf0f\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "41d93c2f0a744fc6cd1aafce9a0eef57355bbf0f", "tree": "2318cdcbf017510f913834c22623a7a6a7878f57", "parents": [ "92b5c47a21d2966348c77e86d5361e41731fb48c", "c88ddfc09338969a4c8fc32be1d3dffb9022a237" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 17:18:57 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 17:18:57 2015 +0000" }, "message": "am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u0027c88ddfc09338969a4c8fc32be1d3dffb9022a237\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "c88ddfc09338969a4c8fc32be1d3dffb9022a237", "tree": "58d662fb505e40bc0af516d2e85882d14650d2e1", "parents": [ "32739430ee20467debd6279d472d976e9f8d6a9f", "2abbc048837182bda04037f53309cde4c73f017d" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 17:11:35 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 17:11:35 2015 +0000" }, "message": "am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u00272abbc048837182bda04037f53309cde4c73f017d\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "2abbc048837182bda04037f53309cde4c73f017d", "tree": "c00bfb87c8de5f5cd05d7275fa8d14afc76b800d", "parents": [ "fbf55d85b398fc7ddd6b4d7442dca932bc1593e6", "ba34c2ba414352ed0c1b9188f51c5445b04af2c6" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 17:01:56 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 17:01:56 2015 +0000" }, "message": "am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u0027ba34c2ba414352ed0c1b9188f51c5445b04af2c6\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "ba34c2ba414352ed0c1b9188f51c5445b04af2c6", "tree": "ed02d9a5eb4429e5b63d0488550c3070c7dfb8d3", "parents": [ "80c17e0d42248053edf7243e026995fefcf6aabd", "f59348edfc54baa8f6e6532c6484656cf444d199" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 16:55:57 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 16:55:57 2015 +0000" }, "message": "am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u0027f59348edfc54baa8f6e6532c6484656cf444d199\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "f59348edfc54baa8f6e6532c6484656cf444d199", "tree": "b1de80119ccc467eed1c5f1fc031605d3eba35d0", "parents": [ "450e1015b7939292ca988dd1b4f0303a094478e9", "0080e03e2a69dcb5ecbcb2848f358ca73163714c" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 16:41:15 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 16:41:15 2015 +0000" }, "message": "am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u00270080e03e2a69dcb5ecbcb2848f358ca73163714c\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "0080e03e2a69dcb5ecbcb2848f358ca73163714c", "tree": "d7888d21e78fbdc52720dee7f9d9b8108afe7831", "parents": [ "9364bdc9a1298a609eb825be051c393cbf3d7a38", "3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 16:34:15 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 16:34:15 2015 +0000" }, "message": "am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u00273ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2", "tree": "2dcb27e1b672253e74fcad62541c8c1f5920297a", "parents": [ "905aae465fa88d6d793c670c08c360900c6cb3f7", "2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 16:23:51 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 16:23:51 2015 +0000" }, "message": "am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u00272c0f959112a1d9048e8dc527f2f9dc0cc3e490c9\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9", "tree": "1aec4b7480fae3c5ae947c44c9feb73f103f9447", "parents": [ "11c88f66205dd9095cbe87f3486ef7262e4d2e22", "fea5921b975cf43c88b8f93d4f2500abde6088be" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 16:16:08 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 16:16:08 2015 +0000" }, "message": "am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u0027fea5921b975cf43c88b8f93d4f2500abde6088be\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "fea5921b975cf43c88b8f93d4f2500abde6088be", "tree": "ef8b9b34438a177693113fcc1922282cf26f0dc1", "parents": [ "2796ba1c511517a4904d10d1fdc830c86d161342", "9fff1d37d6129dfce7a6f89004ec4a9cea9c9cad" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 16:08:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 16:08:43 2015 +0000" }, "message": "am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u00279fff1d37d6129dfce7a6f89004ec4a9cea9c9cad\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "9fff1d37d6129dfce7a6f89004ec4a9cea9c9cad", "tree": "ca971b28d76148f7debc88bc6429fdf8faf8431a", "parents": [ "a555788d9cd4a22a8f5d7dccd288f7d185cef209", "d9d35098aaaa546d79d0707734aac9b4b12c5be1" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 16:01:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 16:01:24 2015 +0000" }, "message": "am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u0027d9d35098aaaa546d79d0707734aac9b4b12c5be1\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "d9d35098aaaa546d79d0707734aac9b4b12c5be1", "tree": "ca971b28d76148f7debc88bc6429fdf8faf8431a", "parents": [ "0e33cb2dd5ccf6f4db8c694cb2c233bb1d2a2d0b", "af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 15:19:26 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 15:19:26 2015 +0000" }, "message": "am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u0027af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "aa8dab77aa9ef1bb6e5414ee5e773001de725bef", "tree": "180e08f055402f5711d632241d8e988a7e32128d", "parents": [ "0e20b2093aa2bbc93afed8d68d3765d18a431b74", "a1e21653e86d21a4ab0946ee2761b6f0163d5742" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Sat Aug 08 14:55:23 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 08 14:55:23 2015 +0000" }, "message": "Merge \"MPEG4Extractor.cpp: Add check for size \u003d\u003d SIZE_MAX\" into jb-dev" }, { "commit": "ab98ee22944857907cb4a2a32c43fb6a9e12f17f", "tree": "52dd4962d5b3f2bcb67dbd88c2504c25d99863ed", "parents": [ "30b936424d0ac88dbaaa1de19718aedd1a67feba", "f647c38a3e4b065fc26d0a8bb55071dae1028ac2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 03:24:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 03:24:44 2015 +0000" }, "message": "am f647c38a: am 648ec9da: am 92b5c47a: am 32739430: am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album art\n\n* commit \u0027f647c38a3e4b065fc26d0a8bb55071dae1028ac2\u0027:\n Fix Ogg album art\n" }, { "commit": "f647c38a3e4b065fc26d0a8bb55071dae1028ac2", "tree": "73ae2b98853f00749c5a1a3471a292a560f05823", "parents": [ "b3adb709bd278004de5764ce45b51140aefcc4c8", "648ec9da3bcf1b9b47f2abf6bfcb2fdf54db7b09" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 03:19:34 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 03:19:34 2015 +0000" }, "message": "am 648ec9da: am 92b5c47a: am 32739430: am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album art\n\n* commit \u0027648ec9da3bcf1b9b47f2abf6bfcb2fdf54db7b09\u0027:\n Fix Ogg album art\n" }, { "commit": "648ec9da3bcf1b9b47f2abf6bfcb2fdf54db7b09", "tree": "684933874d1e9209f0ddb7f6b23b0e4f68a75222", "parents": [ "6323529b60f29ad1e18757f4aadc08f2aa0e846b", "92b5c47a21d2966348c77e86d5361e41731fb48c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 03:12:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 03:12:58 2015 +0000" }, "message": "am 92b5c47a: am 32739430: am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album art\n\n* commit \u002792b5c47a21d2966348c77e86d5361e41731fb48c\u0027:\n Fix Ogg album art\n" }, { "commit": "92b5c47a21d2966348c77e86d5361e41731fb48c", "tree": "684933874d1e9209f0ddb7f6b23b0e4f68a75222", "parents": [ "2424d28b42edd66e6806244cddf2a5eb8675f652", "32739430ee20467debd6279d472d976e9f8d6a9f" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 03:05:51 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 03:05:51 2015 +0000" }, "message": "am 32739430: am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album art\n\n* commit \u002732739430ee20467debd6279d472d976e9f8d6a9f\u0027:\n Fix Ogg album art\n" }, { "commit": "32739430ee20467debd6279d472d976e9f8d6a9f", "tree": "a0c5f08d45048d0dfa3faee7c7449553f082c867", "parents": [ "c40ef74448ddb09b676cc4c79a202ee73fccad39", "fbf55d85b398fc7ddd6b4d7442dca932bc1593e6" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 02:59:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 02:59:00 2015 +0000" }, "message": "am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album art\n\n* commit \u0027fbf55d85b398fc7ddd6b4d7442dca932bc1593e6\u0027:\n Fix Ogg album art\n" }, { "commit": "fbf55d85b398fc7ddd6b4d7442dca932bc1593e6", "tree": "3fe67d27293af0078959a99139ae77f6c1a0459e", "parents": [ "af3c0475b9ee8b9e69e435b2bdd11e5c9172b050", "80c17e0d42248053edf7243e026995fefcf6aabd" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 02:52:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 02:52:55 2015 +0000" }, "message": "am 80c17e0d: am 450e1015: Fix Ogg album art\n\n* commit \u002780c17e0d42248053edf7243e026995fefcf6aabd\u0027:\n Fix Ogg album art\n" }, { "commit": "80c17e0d42248053edf7243e026995fefcf6aabd", "tree": "2b91a07e01b2de981165b44212bdf3efc08b5acc", "parents": [ "9c67741f9f7ccc1007c7ecb44b8037210c733723", "450e1015b7939292ca988dd1b4f0303a094478e9" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 02:47:04 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 02:47:04 2015 +0000" }, "message": "am 450e1015: Fix Ogg album art\n\n* commit \u0027450e1015b7939292ca988dd1b4f0303a094478e9\u0027:\n Fix Ogg album art\n" }, { "commit": "30b936424d0ac88dbaaa1de19718aedd1a67feba", "tree": "52dd4962d5b3f2bcb67dbd88c2504c25d99863ed", "parents": [ "190dfbdbef28b34c2dcd155f2c9d815cc17141cc", "b3adb709bd278004de5764ce45b51140aefcc4c8" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 01:49:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 01:49:48 2015 +0000" }, "message": "am b3adb709: am 6323529b: am 2424d28b: am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge \"Extra sanity checks on sample size and resolution\" into klp-dev\n\n* commit \u0027b3adb709bd278004de5764ce45b51140aefcc4c8\u0027:\n Extra sanity checks on sample size and resolution\n" }, { "commit": "b3adb709bd278004de5764ce45b51140aefcc4c8", "tree": "c44af4770890eff96a1edbf403846a8d971b11ac", "parents": [ "daee18a3af3c1025e8f9abaaa68c6d9bfb2490f4", "6323529b60f29ad1e18757f4aadc08f2aa0e846b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 01:43:23 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 01:43:23 2015 +0000" }, "message": "am 6323529b: am 2424d28b: am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge \"Extra sanity checks on sample size and resolution\" into klp-dev\n\n* commit \u00276323529b60f29ad1e18757f4aadc08f2aa0e846b\u0027:\n Extra sanity checks on sample size and resolution\n" }, { "commit": "6323529b60f29ad1e18757f4aadc08f2aa0e846b", "tree": "87ed8ace81a65f1e9a98907b9598bd00ed4d431f", "parents": [ "9b9e8c6f4f38a91d56facc9e0fcc55e59f64d2ef", "2424d28b42edd66e6806244cddf2a5eb8675f652" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 01:36:56 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 01:36:56 2015 +0000" }, "message": "am 2424d28b: am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge \"Extra sanity checks on sample size and resolution\" into klp-dev\n\n* commit \u00272424d28b42edd66e6806244cddf2a5eb8675f652\u0027:\n Extra sanity checks on sample size and resolution\n" }, { "commit": "2424d28b42edd66e6806244cddf2a5eb8675f652", "tree": "87ed8ace81a65f1e9a98907b9598bd00ed4d431f", "parents": [ "8fec74bd8fafe47325fb3903bc92a4dcc328331f", "c40ef74448ddb09b676cc4c79a202ee73fccad39" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 01:30:35 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 01:30:35 2015 +0000" }, "message": "am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge \"Extra sanity checks on sample size and resolution\" into klp-dev\n\n* commit \u0027c40ef74448ddb09b676cc4c79a202ee73fccad39\u0027:\n Extra sanity checks on sample size and resolution\n" }, { "commit": "c40ef74448ddb09b676cc4c79a202ee73fccad39", "tree": "93465f4bd7afdc5673a25cb09e16d778068cdb9a", "parents": [ "b3949ea56440d7f22f593c9cbafe15eb01de3df9", "af3c0475b9ee8b9e69e435b2bdd11e5c9172b050" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 01:25:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 01:25:33 2015 +0000" }, "message": "am af3c0475: am 9c67741f: am 2e637bfd: Merge \"Extra sanity checks on sample size and resolution\" into klp-dev\n\n* commit \u0027af3c0475b9ee8b9e69e435b2bdd11e5c9172b050\u0027:\n Extra sanity checks on sample size and resolution\n" }, { "commit": "af3c0475b9ee8b9e69e435b2bdd11e5c9172b050", "tree": "4db3db9b09e78f2bb61a3da14e76bd83bca72a24", "parents": [ "72abba8bc6c152a7d5bca8417ef6ab343f2a0cff", "9c67741f9f7ccc1007c7ecb44b8037210c733723" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 01:17:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 01:17:58 2015 +0000" }, "message": "am 9c67741f: am 2e637bfd: Merge \"Extra sanity checks on sample size and resolution\" into klp-dev\n\n* commit \u00279c67741f9f7ccc1007c7ecb44b8037210c733723\u0027:\n Extra sanity checks on sample size and resolution\n" }, { "commit": "9c67741f9f7ccc1007c7ecb44b8037210c733723", "tree": "1677a88e6eacc4b7aed1272c41b5ad1f94598fd4", "parents": [ "276cec63624d198981b37a68cd969031e4f42096", "2e637bfd64c59200414130671e32e3e087e9f147" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 01:12:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Aug 08 01:12:33 2015 +0000" }, "message": "am 2e637bfd: Merge \"Extra sanity checks on sample size and resolution\" into klp-dev\n\n* commit \u00272e637bfd64c59200414130671e32e3e087e9f147\u0027:\n Extra sanity checks on sample size and resolution\n" }, { "commit": "450e1015b7939292ca988dd1b4f0303a094478e9", "tree": "343e686f5c98dd7ade19045f82f0cfebfb2b353c", "parents": [ "2e637bfd64c59200414130671e32e3e087e9f147" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 06 08:03:47 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 01:00:47 2015 +0000" }, "message": "Fix Ogg album art\n\nBug: 23036083\nBug: https://code.google.com/p/android/issues/detail?id\u003d182053\nChange-Id: I1a5cbe06990900160c2addade238c1e9feab8f71\n(cherry picked from commit c63cc509404b9328aedd1be3adc4e87cd07b4eb1)\n" }, { "commit": "190dfbdbef28b34c2dcd155f2c9d815cc17141cc", "tree": "52dd4962d5b3f2bcb67dbd88c2504c25d99863ed", "parents": [ "aa7a4eae1cc93ccf90e273b9634f3a125b0b3565", "c63cc509404b9328aedd1be3adc4e87cd07b4eb1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 01:00:27 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 08 01:00:27 2015 +0000" }, "message": "Merge \"Fix Ogg album art\" into mnc-dev" }, { "commit": "2e637bfd64c59200414130671e32e3e087e9f147", "tree": "14e78321b4e8df9b3052aa81124e9b1134de0481", "parents": [ "4254be9a0d16bac995aa73d60e8e92839960bd32", "e6f5d47a7f9eab8a0009f8a563de473cd47d3110" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Sat Aug 08 00:59:49 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 08 00:59:49 2015 +0000" }, "message": "Merge \"Extra sanity checks on sample size and resolution\" into klp-dev" }, { "commit": "af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9", "tree": "65c2cc7a6171ec1aa7d4088167da13a4da76c582", "parents": [ "e4ccf3a14beabfeeb6c7df47ae118f3db999c1ce", "bce77a36125b25ce864b40bd5938ca89becea898" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Aug 07 23:09:03 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 23:09:03 2015 +0000" }, "message": "am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u0027bce77a36125b25ce864b40bd5938ca89becea898\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "82db269d4797cb9909988b723d91fa2094a74b38", "tree": "77f2ff4451760a09704ab7676f9e680e9af0729a", "parents": [ "aa7a4eae1cc93ccf90e273b9634f3a125b0b3565" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 07 13:59:42 2015 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 07 15:23:46 2015 -0700" }, "message": "audio policy: protect capture from telephony RX path.\n\nAdd permission check if the capture device selected is telephony\nRX path.\n\nBug: 23017158.\nChange-Id: Iaa34d836e6cf46b7cbbf2483fcd4306dcd27ce90\n" }, { "commit": "c63cc509404b9328aedd1be3adc4e87cd07b4eb1", "tree": "65df03d3585206215f2dcf8a1f45a664a39436e8", "parents": [ "821b6c29d3d5782ae17aedc77f406c9eaf2ab2fb" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 06 08:03:47 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 19:35:25 2015 +0000" }, "message": "Fix Ogg album art\n\nBug: 23036083\nBug: https://code.google.com/p/android/issues/detail?id\u003d182053\nChange-Id: I1a5cbe06990900160c2addade238c1e9feab8f71\n" }, { "commit": "bce77a36125b25ce864b40bd5938ca89becea898", "tree": "0c29e311b7b76d2cba60fff960a83822d84240f8", "parents": [ "3329a19b4d11d3c1310bbe9aa54b6a66488ab862", "0e20b2093aa2bbc93afed8d68d3765d18a431b74" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Aug 07 18:41:28 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 18:41:28 2015 +0000" }, "message": "am 0e20b209: MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\n* commit \u00270e20b2093aa2bbc93afed8d68d3765d18a431b74\u0027:\n MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n" }, { "commit": "0e20b2093aa2bbc93afed8d68d3765d18a431b74", "tree": "c879ddcd10685be34fc5faf91719ed3d139db777", "parents": [ "c87faed60483afb2466e03892bda80b72e5822c7" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Aug 07 11:19:24 2015 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Aug 07 11:31:22 2015 -0700" }, "message": "MPEG4Extractor.cpp: handle chunk_size \u003e SIZE_MAX\n\nchunk_size is a uint64_t, so it can legitimately be bigger\nthan SIZE_MAX, which would cause the subtraction to underflow.\n\nhttps://code.google.com/p/android/issues/detail?id\u003d182251\n\nBug: 23034759\nChange-Id: Ic1637fb26bf6edb0feb1bcf2876fd370db1ed547\n" }, { "commit": "aa7a4eae1cc93ccf90e273b9634f3a125b0b3565", "tree": "b9f2321a4c7b5d2b2f91322cfe322c9f3d622f53", "parents": [ "1d467a730e579e15010048011a86c2728f02b8fd", "daee18a3af3c1025e8f9abaaa68c6d9bfb2490f4" ], "author": { "name": "Joshua J. Drake", "email": "android-open-source@qoop.org", "time": "Fri Aug 07 18:19:41 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 18:19:41 2015 +0000" }, "message": "am daee18a3: am 9b9e8c6f: am 8fec74bd: am b3949ea5: am 72abba8b: am 276cec63: am 4254be9a: am 9364bdc9: am 905aae46: am 11c88f66: am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1: am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG4 processing\n\n* commit \u0027daee18a3af3c1025e8f9abaaa68c6d9bfb2490f4\u0027:\n Fix integer underflow in covr MPEG4 processing\n" } ], "next": "1d467a730e579e15010048011a86c2728f02b8fd" }