)]}' { "log": [ { "commit": "5fa779d9c1acbebc562dabefc1f6d857b22fe4fb", "tree": "7c709578e69745f4fc93f94315924257c00358ae", "parents": [ "efee87b357d09e09aa58bcee2b5fb19154c666c4", "0277976e8118ac493440049affeb1fce1f08598e" ], "author": { "name": "Justin Chuang", "email": "jchuang@google.com", "time": "Wed May 04 06:44:41 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 06:44:41 2016 +0000" }, "message": "Merge \"Allow RGBX8888 in soft video encoder\" into nyc-dev\nam: 0277976e81\n\n* commit \u00270277976e8118ac493440049affeb1fce1f08598e\u0027:\n Allow RGBX8888 in soft video encoder\n\nChange-Id: I437c37da24c91bfe706aef873ea97c864ddd9e50\n" }, { "commit": "0277976e8118ac493440049affeb1fce1f08598e", "tree": "b2ff3fd08b42b6fb20bcd2504703a9a6daed42a0", "parents": [ "b2e7ceb874b7fe5a6c1b3a72a42f09969edf445f", "075999616e5764462316f31ce628146c1174b1d5" ], "author": { "name": "Sheng-hao Tsao", "email": "shenghao@google.com", "time": "Wed May 04 06:39:49 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 04 06:39:49 2016 +0000" }, "message": "Merge \"Allow RGBX8888 in soft video encoder\" into nyc-dev" }, { "commit": "075999616e5764462316f31ce628146c1174b1d5", "tree": "be0fc4b7f35b2f841518baa7927c1e5c441c1ac5", "parents": [ "26583ffe69a7601ad29e00094fe66ce795356fab" ], "author": { "name": "Justin Chuang", "email": "jchuang@google.com", "time": "Fri Apr 29 10:50:12 2016 +0800" }, "committer": { "name": "Sheng-Hao Tsao", "email": "shenghao@google.com", "time": "Wed May 04 14:26:19 2016 +0800" }, "message": "Allow RGBX8888 in soft video encoder\n\nBUG\u003d27844478,28550227\nTEST\u003dandroid.hardware.camera2.cts.RecordingTest will pass\nChange-Id: Ib669d4a2447bb5d76b9d0cdc34469cad77a98ee2\n" }, { "commit": "efee87b357d09e09aa58bcee2b5fb19154c666c4", "tree": "68b323e3020973bd63f441fc92741c9a383aba6e", "parents": [ "ee7ff029e0313f32aa371aa7f94d80b534fb36df", "b2e7ceb874b7fe5a6c1b3a72a42f09969edf445f" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 04 04:43:05 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 04:43:05 2016 +0000" }, "message": "Merge \"Check section size when verifying CRC\" into mnc-dev am: fd9e18a00d am: 4a46a277f8 am: 8f53b71bf3 am: c920b2c27f\nam: b2e7ceb874\n\n* commit \u0027b2e7ceb874b7fe5a6c1b3a72a42f09969edf445f\u0027:\n Check section size when verifying CRC\n\nChange-Id: I9e183d87625f252868b3f888de837659cf292343\n" }, { "commit": "b2e7ceb874b7fe5a6c1b3a72a42f09969edf445f", "tree": "8ef203ea2843c8476479463dbfb52c9eb04ae1c1", "parents": [ "26583ffe69a7601ad29e00094fe66ce795356fab", "c920b2c27fc81b9ae305f8213fedb48803facee5" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 04 04:39:28 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 04:39:28 2016 +0000" }, "message": "Merge \"Check section size when verifying CRC\" into mnc-dev am: fd9e18a00d am: 4a46a277f8 am: 8f53b71bf3\nam: c920b2c27f\n\n* commit \u0027c920b2c27fc81b9ae305f8213fedb48803facee5\u0027:\n Check section size when verifying CRC\n\nChange-Id: I6ef0f68ff63469c1e6da0b7eab3fe946058573ac\n" }, { "commit": "c920b2c27fc81b9ae305f8213fedb48803facee5", "tree": "819005bec006f3f358f5be40c37ce7b53396f948", "parents": [ "1863e62d0f49b01b7d066e2d7c47fef249fffd9d", "8f53b71bf345c5e0306d0f1078dd745e316c69c4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 04 04:35:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 04:35:44 2016 +0000" }, "message": "Merge \"Check section size when verifying CRC\" into mnc-dev am: fd9e18a00d am: 4a46a277f8\nam: 8f53b71bf3\n\n* commit \u00278f53b71bf345c5e0306d0f1078dd745e316c69c4\u0027:\n Check section size when verifying CRC\n\nChange-Id: I87a5a52e2dfe99a4be2457a39185e3828e6c7c9f\n" }, { "commit": "8f53b71bf345c5e0306d0f1078dd745e316c69c4", "tree": "23f66e691f699bdd71420e6d4d5808c308d368ee", "parents": [ "26ef0c43859fd505456fe4aa7bf7e6fabb91a237", "4a46a277f82d738e27ec0866a9f5b30d55b19526" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 04 04:32:03 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 04:32:03 2016 +0000" }, "message": "Merge \"Check section size when verifying CRC\" into mnc-dev am: fd9e18a00d\nam: 4a46a277f8\n\n* commit \u00274a46a277f82d738e27ec0866a9f5b30d55b19526\u0027:\n Check section size when verifying CRC\n\nChange-Id: I20c63cff2b29723437ebafe44bf7b6b9e8333ead\n" }, { "commit": "4a46a277f82d738e27ec0866a9f5b30d55b19526", "tree": "bbaa31a3470ef45058891f9bfb407fc14d1a0733", "parents": [ "c83479de2497e93311932c03e5cd414a1088e6a2", "fd9e18a00d84557d3f8caadc6eacd1a5c587fff9" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 04 04:28:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 04 04:28:24 2016 +0000" }, "message": "Merge \"Check section size when verifying CRC\" into mnc-dev\nam: fd9e18a00d\n\n* commit \u0027fd9e18a00d84557d3f8caadc6eacd1a5c587fff9\u0027:\n Check section size when verifying CRC\n\nChange-Id: If74362153115c89dec30899ca8ce2e0bcd9976b1\n" }, { "commit": "fd9e18a00d84557d3f8caadc6eacd1a5c587fff9", "tree": "cecabbb1d2223225de8d1728e7716cd3233ff257", "parents": [ "5f527d44d7155103ffd3b1780008dd1441511016", "c0c9f50d15f7b9ed539c0c6277296d083f41b293" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 04 04:20:22 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 04 04:20:22 2016 +0000" }, "message": "Merge \"Check section size when verifying CRC\" into mnc-dev" }, { "commit": "ee7ff029e0313f32aa371aa7f94d80b534fb36df", "tree": "e148903f0d7934fbd71a4b242f2a87db39ab135d", "parents": [ "95aa1eb5a09865a50d272bace5ced2a117e8828e", "26583ffe69a7601ad29e00094fe66ce795356fab" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:47:40 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:47:40 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 am: 5f527d44d7 am: c83479de24 am: 26ef0c4385 am: 1863e62d0f\nam: 26583ffe69\n\n* commit \u002726583ffe69a7601ad29e00094fe66ce795356fab\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I016ff03271a2839a725d58eedf13818c7931f778\n" }, { "commit": "26583ffe69a7601ad29e00094fe66ce795356fab", "tree": "7d2e9ac334cbb050ee6be1ef77a90c36faf2147e", "parents": [ "7aa45dd7fc5c2bd959f1571231556ac06b7ec8ae", "1863e62d0f49b01b7d066e2d7c47fef249fffd9d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:45:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:45:10 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 am: 5f527d44d7 am: c83479de24 am: 26ef0c4385\nam: 1863e62d0f\n\n* commit \u00271863e62d0f49b01b7d066e2d7c47fef249fffd9d\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I6b890a1e3964ba6623344414a5a897cc19a84e88\n" }, { "commit": "1863e62d0f49b01b7d066e2d7c47fef249fffd9d", "tree": "ca6f522b9a1ed41db5590c75cd4fa392dd2f16ea", "parents": [ "a4672c43a771ab42260382f293cbfe6bddc62816", "26ef0c43859fd505456fe4aa7bf7e6fabb91a237" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:42:32 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:42:32 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 am: 5f527d44d7 am: c83479de24\nam: 26ef0c4385\n\n* commit \u002726ef0c43859fd505456fe4aa7bf7e6fabb91a237\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I9c66605afa05d147f0018d6f2c650ec0811dd1ac\n" }, { "commit": "26ef0c43859fd505456fe4aa7bf7e6fabb91a237", "tree": "b6044c511f901b0b0718d082227432be343de650", "parents": [ "cba11f751f7dcc5243f6e29f7bd58513255a5a3d", "c83479de2497e93311932c03e5cd414a1088e6a2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:40:03 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:40:03 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 am: 5f527d44d7\nam: c83479de24\n\n* commit \u0027c83479de2497e93311932c03e5cd414a1088e6a2\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: Iedb6c73113b84f521f8616116326e1933dcc44e9\n" }, { "commit": "c83479de2497e93311932c03e5cd414a1088e6a2", "tree": "3309962d5d732b110045eb85b16469831b2b3e7f", "parents": [ "364a89bb840d35fe6d7156ee69aed85798e1dba4", "5f527d44d7155103ffd3b1780008dd1441511016" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:37:35 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:37:35 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12\nam: 5f527d44d7\n\n* commit \u00275f527d44d7155103ffd3b1780008dd1441511016\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I543a1c93d6d82736dab9ce7de0208deeae1a4667\n" }, { "commit": "5f527d44d7155103ffd3b1780008dd1441511016", "tree": "b51227ae54d477a9de0f33ca37784834763d7266", "parents": [ "eaa4d780120dd690be2ae035ef4e715026b5b12e", "7c3e69cd12e2e631ab97ce10b71def69b3490d9d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:35:12 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:35:12 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b\nam: 7c3e69cd12\n\n* commit \u00277c3e69cd12e2e631ab97ce10b71def69b3490d9d\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: If5f841e873f937669e3e23f77bbfb43f109c563d\n" }, { "commit": "7c3e69cd12e2e631ab97ce10b71def69b3490d9d", "tree": "e7fbcaaa5464fa07483e7b4a02d38039d5d5d165", "parents": [ "995d39cc23949569ea3a689985812ee923da5d4f", "d2c61d049b52158c506a2c61727078fccb92b898" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:32:43 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:32:43 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0\nam: d2c61d049b\n\n* commit \u0027d2c61d049b52158c506a2c61727078fccb92b898\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I5e41f418c9fcdea8bc05c150772a0b87cef101bd\n" }, { "commit": "38f24823d0bb4b15db9ceac264e01401a653619c", "tree": "46a5305259366d584131f831ba73f42937f91dfe", "parents": [ "08228644dda7d9d7e5cb5349a5d4790e08a99e5c", "ef1fcffc9808df37f4031ddbf247492c8609559a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:27:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:27:46 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa\nam: ef1fcffc98\n\n* commit \u0027ef1fcffc9808df37f4031ddbf247492c8609559a\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I77dcc292f32549bd62869b710d3842853a7528fa\n" }, { "commit": "ef1fcffc9808df37f4031ddbf247492c8609559a", "tree": "ad6a98096ba0a13d9cf4a6af6eba1f5718783b0b", "parents": [ "a3c7788e822f5f961489bd93ae88c6824c9d3915", "2d4cf313fa141d11cfae7c31797da114598d8ed7" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:25:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:25:22 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e am: 4b817b51e2\nam: 2d4cf313fa\n\n* commit \u00272d4cf313fa141d11cfae7c31797da114598d8ed7\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I0d1569e886ff40a43423cdbf83ed5d04e35f2d07\n" }, { "commit": "2d4cf313fa141d11cfae7c31797da114598d8ed7", "tree": "071a098d94514f57ca52af53c010d964d02a7bfe", "parents": [ "f54f5b54bd5bd78e045fbf9dbc6462d0720f1ff6", "4b817b51e2998719037f362c7b70ee71c76abeb8" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:23:01 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 23:23:01 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev am: 71095f174e\nam: 4b817b51e2\n\n* commit \u00274b817b51e2998719037f362c7b70ee71c76abeb8\u0027:\n Clear unused pointer field when sending across binder\n\nChange-Id: I6d09ecb88cf32f2c720dd0ec66964ec94ad210da\n" }, { "commit": "71095f174e8b88e008623b4cacd4ec0581b9015c", "tree": "8bf4ba16286ea7922cf653f1c1240bdb8bea1793", "parents": [ "c002126cb05b1d640c0a0b51bc0de810a62ab2b1", "e663be8d475ec6035a1a4257b208549b4375fa08" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue May 03 23:15:43 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 03 23:15:43 2016 +0000" }, "message": "Merge \"Clear unused pointer field when sending across binder\" into klp-dev" }, { "commit": "95aa1eb5a09865a50d272bace5ced2a117e8828e", "tree": "e5fc9b9377f1f6b1b4896dd9dd7788b8a4ae4fc6", "parents": [ "d7290ab2c133e553cb3b0019cb2e970b0c73c211", "7aa45dd7fc5c2bd959f1571231556ac06b7ec8ae" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue May 03 17:31:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 17:31:16 2016 +0000" }, "message": "Merge \"AudioTrack: Fix timestamp jitter\" into nyc-dev\nam: 7aa45dd7fc\n\n* commit \u00277aa45dd7fc5c2bd959f1571231556ac06b7ec8ae\u0027:\n AudioTrack: Fix timestamp jitter\n\nChange-Id: I2f015ce48bc668bc06968f6b3d2087ee8ee047cf\n" }, { "commit": "7aa45dd7fc5c2bd959f1571231556ac06b7ec8ae", "tree": "93445d577ff2a865f26116d78a59dd612fe53229", "parents": [ "9b04a0225085acdf6dd4944fb43695f246669014", "b01faa31462e19957ae3c0c3ada07c9576a9494f" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Tue May 03 17:25:38 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 03 17:25:38 2016 +0000" }, "message": "Merge \"AudioTrack: Fix timestamp jitter\" into nyc-dev" }, { "commit": "d7290ab2c133e553cb3b0019cb2e970b0c73c211", "tree": "45b684130080f37bea7eabb2f551b3e06300cd44", "parents": [ "47734c9509ecb472c2844cae46e2d916b9358321", "9b04a0225085acdf6dd4944fb43695f246669014" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue May 03 00:09:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 03 00:09:17 2016 +0000" }, "message": "Merge \"Normal tracks use triple buffering if resampling\" into nyc-dev\nam: 9b04a02250\n\n* commit \u00279b04a0225085acdf6dd4944fb43695f246669014\u0027:\n Normal tracks use triple buffering if resampling\n\nChange-Id: Ib57f537dd43eeb58289d12b5d43e26a2503f2db1\n" }, { "commit": "9b04a0225085acdf6dd4944fb43695f246669014", "tree": "d13bfff743f06e3be59b78981c579e14bdd8a23f", "parents": [ "9e23567ed02c30bb390ffe56b25f59b626cd9eab", "aebe9dc29988c94a774208ba659c4f156d274d79" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon May 02 23:53:52 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 02 23:53:53 2016 +0000" }, "message": "Merge \"Normal tracks use triple buffering if resampling\" into nyc-dev" }, { "commit": "aebe9dc29988c94a774208ba659c4f156d274d79", "tree": "48a77c49fdc9d1bd0b8e43e4fe1b9ca29a75fefc", "parents": [ "5bdfad1a45a7d5fd03732c75768eef65975660dc" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon May 02 14:38:21 2016 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon May 02 14:38:21 2016 -0700" }, "message": "Normal tracks use triple buffering if resampling\n\nBug: 26230944\nChange-Id: I40f6cd7147db1be95f297af406c77c6404a76f37\n" }, { "commit": "e663be8d475ec6035a1a4257b208549b4375fa08", "tree": "1c4a94e725ba62ed4d42f9e42cde94ab4bc08868", "parents": [ "a3dd713893658baf50df88b261aba83bb0c40687" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 02 14:12:34 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon May 02 14:12:34 2016 -0700" }, "message": "Clear unused pointer field when sending across binder\n\nBug: 28377502\nChange-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98\n" }, { "commit": "47734c9509ecb472c2844cae46e2d916b9358321", "tree": "6b17e7f1540458e2f1abbe1c082353f920edc3df", "parents": [ "20be7bf5ba6f3d4db36686d5af4316006cf9bb27", "98a9b2a491360c762e2ed46a9126f576693645a5" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Mon May 02 12:23:44 2016 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Mon May 02 12:23:44 2016 -0700" }, "message": "resolve merge conflicts of 98a9b2a to nyc-dev-plus-aosp\n\nChange-Id: Iae0a5cb698807d74ba28878d7ce1f69b6ba5219a\n" }, { "commit": "20be7bf5ba6f3d4db36686d5af4316006cf9bb27", "tree": "7a54fce280b4dd4c504dab63e72e63a78968dc5c", "parents": [ "267acea1a23175731f32b53e0019fd1c168da187", "9e23567ed02c30bb390ffe56b25f59b626cd9eab" ], "author": { "name": "Chien-Yu Chen", "email": "cychen@google.com", "time": "Mon May 02 18:36:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 02 18:36:13 2016 +0000" }, "message": "Merge \"Camera: Fix passing video native handle for 64-bit app\" into nyc-dev\nam: 9e23567ed0\n\n* commit \u00279e23567ed02c30bb390ffe56b25f59b626cd9eab\u0027:\n Camera: Fix passing video native handle for 64-bit app\n\nChange-Id: I1bc16ac12f98f969ab9d54b43fdda90fc462c300\n" }, { "commit": "9e23567ed02c30bb390ffe56b25f59b626cd9eab", "tree": "43d66f53f3994f913509a57757cd344a42ea378c", "parents": [ "5bdfad1a45a7d5fd03732c75768eef65975660dc", "2d13b1d3eeaba31d8c15acc6037fd68b150a9a66" ], "author": { "name": "Chien-Yu Chen", "email": "cychen@google.com", "time": "Mon May 02 18:24:52 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 02 18:24:55 2016 +0000" }, "message": "Merge \"Camera: Fix passing video native handle for 64-bit app\" into nyc-dev" }, { "commit": "b01faa31462e19957ae3c0c3ada07c9576a9494f", "tree": "8e01ae4c10bb12e81745787526c34ba3b6abf2af", "parents": [ "ecd0a41d9a2cc9efbc4ad6d4c91d417461772933" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Apr 27 12:51:32 2016 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Apr 29 18:16:03 2016 -0700" }, "message": "AudioTrack: Fix timestamp jitter\n\nWhen HAL out_get_presentation_position returns error,\nuse server position adjusted for latency.\n\nBug: 28250436\nChange-Id: I3dbcb9b7c4e56d34e7e161d1a02d8f64afd602b9\n" }, { "commit": "2d13b1d3eeaba31d8c15acc6037fd68b150a9a66", "tree": "697328a5049f2f91ff6cf30a7ae7ae7bf5adc1b0", "parents": [ "c5e8b6b792abd029e3f7fedf0ca2f705d6c8d222" ], "author": { "name": "Chien-Yu Chen", "email": "cychen@google.com", "time": "Thu Apr 28 12:11:20 2016 -0700" }, "committer": { "name": "Chien-Yu Chen", "email": "cychen@google.com", "time": "Fri Apr 29 17:27:30 2016 -0700" }, "message": "Camera: Fix passing video native handle for 64-bit app\n\nAdd new binder calls to pass video native handle so the video native\nhandle can be passed between 32-bit and 64-bit processes.\n\nRemove problematic code that used IMemory to pass video native\nhandle because the sizes of VideoNativeMetadata are different in\n32-bit and 64-bit processes.\n\nBug: 28403412\nChange-Id: I3341b1812ecc41d61846bb72ca926ecb1674c9ec\n" }, { "commit": "267acea1a23175731f32b53e0019fd1c168da187", "tree": "7932febfb4a51720e2148fbfcc41dc2a00abac8e", "parents": [ "272164c3c28c8110dd1867cd713dc09d23756d6c", "5bdfad1a45a7d5fd03732c75768eef65975660dc" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 29 20:46:20 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 29 20:46:20 2016 +0000" }, "message": "Merge \"Fix more potential overflows in amrwbenc\" into nyc-dev\nam: 5bdfad1a45\n\n* commit \u00275bdfad1a45a7d5fd03732c75768eef65975660dc\u0027:\n Fix more potential overflows in amrwbenc\n\nChange-Id: Ieb9c17d1045b373b2b7fbb4704e3de076f62ae39\n" }, { "commit": "5bdfad1a45a7d5fd03732c75768eef65975660dc", "tree": "81205ecaf938e7d40a1f95bcdaf8f222f90349d0", "parents": [ "30dfd456ff3a37fd95b1d12ad2ef3282126ad260", "ef384d17fb870ba3c196b29b858a015c76864578" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 29 20:41:15 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 29 20:41:15 2016 +0000" }, "message": "Merge \"Fix more potential overflows in amrwbenc\" into nyc-dev" }, { "commit": "272164c3c28c8110dd1867cd713dc09d23756d6c", "tree": "c6f0cd5b8072db5814b09543b87063750ab37287", "parents": [ "c03ab34de017c1330632f4d1c37983bb493bf93b", "30dfd456ff3a37fd95b1d12ad2ef3282126ad260" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 29 20:23:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 29 20:23:55 2016 +0000" }, "message": "Merge \"Fix integer overflow in amrwbdec\" into nyc-dev\nam: 30dfd456ff\n\n* commit \u002730dfd456ff3a37fd95b1d12ad2ef3282126ad260\u0027:\n Fix integer overflow in amrwbdec\n\nChange-Id: I4e273f9a8f4aa6b1c8ca05fca2254e87621d138b\n" }, { "commit": "30dfd456ff3a37fd95b1d12ad2ef3282126ad260", "tree": "4b0a0718ebe2bb7751bc16559110882614d5e011", "parents": [ "d0389b874d592b960bdc456c2514a36b082c2c94", "51fb5e9931b5585cd4ff60328a93fdf30752eea4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 29 20:20:54 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 29 20:20:54 2016 +0000" }, "message": "Merge \"Fix integer overflow in amrwbdec\" into nyc-dev" }, { "commit": "ef384d17fb870ba3c196b29b858a015c76864578", "tree": "f3c881c544185eaf4d6fcae732bd5962f98a80fd", "parents": [ "35443e32bfe0960dc6a6564426054b104977b143" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Apr 28 14:31:26 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 29 12:02:30 2016 -0700" }, "message": "Fix more potential overflows in amrwbenc\n\nBug: 28268307\nChange-Id: Ibe32bee8c73950e3a9cae13bd4b516f9c7428673\n" }, { "commit": "51fb5e9931b5585cd4ff60328a93fdf30752eea4", "tree": "368bb8af4b8de9b6eec0e5c1cdb54e2cd8a32d64", "parents": [ "35443e32bfe0960dc6a6564426054b104977b143" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Apr 28 10:57:08 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 29 11:09:23 2016 -0700" }, "message": "Fix integer overflow in amrwbdec\n\nThe existing code did its own after-the-fact overflow checks.\nReplace it with before-the-fact checks.\n\nBug: 28387859\nChange-Id: Iea7e2055d0c0de54120b09a7a00df8a0a9192388\n" }, { "commit": "c03ab34de017c1330632f4d1c37983bb493bf93b", "tree": "2d1d0f01e94de386a9dfab091037beffe376c459", "parents": [ "03f191f556d021cfcefa260ceeba2c87283febc6", "d0389b874d592b960bdc456c2514a36b082c2c94" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Apr 29 14:29:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 29 14:29:26 2016 +0000" }, "message": "Merge \"Can now indicate the desired number of notifications (sub-buffers)\" into nyc-dev\nam: d0389b874d\n\n* commit \u0027d0389b874d592b960bdc456c2514a36b082c2c94\u0027:\n Can now indicate the desired number of notifications (sub-buffers)\n\nChange-Id: I56e20dbd5f386b53af87acc9a5fe111f60147a5b\n" }, { "commit": "ea38ee7742e799b23bd8675f5801ef72f94de0f4", "tree": "49a00a228e6304a36d19ff4126293c8fce16ff73", "parents": [ "ecd0a41d9a2cc9efbc4ad6d4c91d417461772933" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Apr 18 11:08:01 2016 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Apr 28 16:36:22 2016 -0700" }, "message": "Can now indicate the desired number of notifications (sub-buffers)\n\nper fast track buffer when using the default buffer size.\n\nThere is no change for normal tracks, or fast tracks with a non-default buffer size.\n\nAlso fix related bugs:\nNotification period was not set correctly when fast multiplier is not 1.\nIncorrect warning when client adjusted notification frames.\n\nBug: 27819623\nBug: 28117362\nChange-Id: Ifc2121e874f51718cd56ec04e4bd5f89f4963132\n" }, { "commit": "c0c9f50d15f7b9ed539c0c6277296d083f41b293", "tree": "a0bf60b151d5faf534015c2789f2babc7742f372", "parents": [ "eaa4d780120dd690be2ae035ef4e715026b5b12e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Apr 28 13:32:41 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Apr 28 13:32:41 2016 -0700" }, "message": "Check section size when verifying CRC\n\nBug: 28333006\nChange-Id: Ief7a2da848face78f0edde21e2f2009316076679\n" }, { "commit": "4c0d6da0073e33d1c88ed52481f430ad68bd73ea", "tree": "dae010e49a9bad5dc209a4b316c95e598967534e", "parents": [ "5eb564afe15169c92504185e43e6c83888d67de7", "ecd0a41d9a2cc9efbc4ad6d4c91d417461772933" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Apr 28 09:46:18 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 28 09:46:18 2016 +0000" }, "message": "Merge \"Move system services into correct cpusets.\" into nyc-dev\nam: ecd0a41\n\n* commit \u0027ecd0a41d9a2cc9efbc4ad6d4c91d417461772933\u0027:\n Move system services into correct cpusets.\n\nChange-Id: I752b8b857ca94be20160ddebfb041aab0cca5fca\n" }, { "commit": "ecd0a41d9a2cc9efbc4ad6d4c91d417461772933", "tree": "64597a37b1444dcaef712e6fe6de1107b829baa9", "parents": [ "c5e8b6b792abd029e3f7fedf0ca2f705d6c8d222", "58f3e5541361cb04d64b8ad6a676ad0d77a4ee57" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Apr 28 09:34:56 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Apr 28 09:34:57 2016 +0000" }, "message": "Merge \"Move system services into correct cpusets.\" into nyc-dev" }, { "commit": "090ef604f81447eab4aa0a5b45d6307482573560", "tree": "6eb6530aab79b1cdc543ef16650be519db449e37", "parents": [ "cdf7931424583ff20a754999216041fb46287cb3" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Wed Apr 27 10:39:54 2016 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Wed Apr 27 10:55:42 2016 -0700" }, "message": "Fix google-explicit-constructor warnings.\n\nBug: 28341362\nChange-Id: I625fbab25f16282c2ea929cd16283d9d146fa17b\n" }, { "commit": "51ab9527d7427589e527d0dc8118d663926a8b68", "tree": "f75e953cb1431ab6eca9eb90226066b6de489bb3", "parents": [ "868ab87ae6b690815cebb2a4a9766ed6a894afff", "40601964e1f8966d90c31b0c389dfab6a515bd50" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 27 05:25:28 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 27 05:25:28 2016 +0000" }, "message": "Merge \"Remove MediaDrm stack from mediaserver\" into nyc-dev\nam: 4060196\n\n* commit \u002740601964e1f8966d90c31b0c389dfab6a515bd50\u0027:\n Remove MediaDrm stack from mediaserver\n\nChange-Id: I8d9fca7ed5d7bc2d9338dd9919ceef6631abd781\n" }, { "commit": "40601964e1f8966d90c31b0c389dfab6a515bd50", "tree": "247485dc0050db48282d46acc4ad8dc836abc993", "parents": [ "64cc92884966864b7a08e0eac74be108edf883da", "3003807fcfa96c9cbfea18d643f47108aa116cd5" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 27 05:21:47 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 27 05:21:49 2016 +0000" }, "message": "Merge \"Remove MediaDrm stack from mediaserver\" into nyc-dev" }, { "commit": "3003807fcfa96c9cbfea18d643f47108aa116cd5", "tree": "a3f7b454cdf3973b6fd716ee44f4295e6c100bb5", "parents": [ "c3c06c4fe329d07bd7d442206bc9eb63e92bf5bd" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Apr 25 13:41:35 2016 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 26 20:46:17 2016 -0700" }, "message": "Remove MediaDrm stack from mediaserver\n\nPart of media security hardening\n\nMediaDrm was temporarily allowed to\nrun in either mediaserver or mediadrmserver\nwhile all nexus devices were implementing\nsupport for the native_handle representation\nof secure buffers. Now that all nexus\ndevices support native_handle, the MediaDrm\nstack can be removed from mediaserver.\n\nb/22990512\n\nChange-Id: Ie5d83bfeb4c4a824e1d0edb4c9452c782d6fd386\n" }, { "commit": "868ab87ae6b690815cebb2a4a9766ed6a894afff", "tree": "70ea9680c460dd515801d1f0da23c004b16583c2", "parents": [ "ad17c39aef184144299aeb3662d07d23f191e46b", "64cc92884966864b7a08e0eac74be108edf883da" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Apr 27 03:38:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 27 03:38:09 2016 +0000" }, "message": "Merge \"GenericSource: reduce logging.\" into nyc-dev\nam: 64cc928\n\n* commit \u002764cc92884966864b7a08e0eac74be108edf883da\u0027:\n GenericSource: reduce logging.\n\nChange-Id: I5aacd7365b13b3afef4056f79eedc3ab990d146f\n" }, { "commit": "64cc92884966864b7a08e0eac74be108edf883da", "tree": "a37cd9c45b0b42bc66646f442094f32064f1b302", "parents": [ "c1e0154940f84014967f9f611d22ad85a01be7cb", "4d71c0224e48d87c81363ad061d58deaf991a323" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Apr 27 02:51:49 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 27 02:51:50 2016 +0000" }, "message": "Merge \"GenericSource: reduce logging.\" into nyc-dev" }, { "commit": "4d71c0224e48d87c81363ad061d58deaf991a323", "tree": "ff98d3a4a7b43e2a43c11948afdd92abefb9e549", "parents": [ "5ec9c98272753b9f4cd16d5a9e2d9f4d4b2c164b" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Apr 26 17:18:18 2016 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Tue Apr 26 18:09:45 2016 -0700" }, "message": "GenericSource: reduce logging.\n\nBug: 28408463\nChange-Id: I48eb7e7f6c5d786c4dc37c2abfc6733fe926cf9d\n" }, { "commit": "ba890f84a37e49e5876fc446b73d7ec01d70578b", "tree": "00c8224353dcfe5b093aa3d8a52296212884f0ab", "parents": [ "e220801f1a86d4158dc7e776517979a45a6dad97", "1302f9ddd27c89f73cc7790d518f8fc88d89560c" ], "author": { "name": "Hangyu Kuang", "email": "hkuang@google.com", "time": "Tue Apr 26 17:39:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 26 17:39:44 2016 +0000" }, "message": "Merge \"Stagefright: Add HDRStaticInfo support for encoder.\" into nyc-dev\nam: 1302f9d\n\n* commit \u00271302f9ddd27c89f73cc7790d518f8fc88d89560c\u0027:\n Stagefright: Add HDRStaticInfo support for encoder.\n\nChange-Id: I342b60a212d3c1ffb757d97179a5c12b0a53a4a4\n" }, { "commit": "1302f9ddd27c89f73cc7790d518f8fc88d89560c", "tree": "25db99fd90500f17aa129753eec6f3065f01a21c", "parents": [ "507ed0299893e085f5b5dc8e0f35ab2da6667577", "5e2f5c10dcedbddd0ea0255f049468760aa09048" ], "author": { "name": "Hangyu Kuang", "email": "hkuang@google.com", "time": "Tue Apr 26 17:25:04 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 26 17:25:04 2016 +0000" }, "message": "Merge \"Stagefright: Add HDRStaticInfo support for encoder.\" into nyc-dev" }, { "commit": "58f3e5541361cb04d64b8ad6a676ad0d77a4ee57", "tree": "c9141eb0d37fe71c38956b341840845e7d3a697c", "parents": [ "d298fb880ba440793ce206e5f519d4f7c8c8bb54" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Fri Apr 15 14:27:22 2016 +0200" }, "committer": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Tue Apr 26 08:48:12 2016 +0000" }, "message": "Move system services into correct cpusets.\n\nTo foreground:\n- cameraserver\n- mediaserver\n- audioserver\n- mediacodec\n- drmserver\n- mediadrmserver\n- mediaextractor\n\nBug: 24949295\nChange-Id: I182e5cf6fa4b33d87a0a2f77b0b03fa8d76b8e27\n" }, { "commit": "84d7e874983ee0d66db328c454fa603374d4635f", "tree": "63aebc219345d0d93ec9c76a4a6bb8105178ed5e", "parents": [ "20cb827ac527bb3f62e6009470ad0d595240807e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Apr 25 14:46:06 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Apr 25 14:46:06 2016 -0700" }, "message": "Fix build\n\nChange-Id: I2d95eb0ce701e3998366f675c86647e1cb3f343c\n" }, { "commit": "20cb827ac527bb3f62e6009470ad0d595240807e", "tree": "3bbe226dd914aaf281c3b6cf6d173fe501223a8b", "parents": [ "0f75d202d4c2f8bc190e5356fd00073363a76845", "89c03a36e2edba3780800d4a45faa0d9998c4097" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Apr 25 13:53:25 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Apr 25 13:57:41 2016 -0700" }, "message": "resolve merge conflicts of 89c03a3 to nyc-dev-plus-aosp\n\nChange-Id: Iadc9712436524303be184c60a622ef79f0efb3e7\n" }, { "commit": "b6e9b8919c9ba25afc0f7f55ee3933f5d9f24dc8", "tree": "07599ed2e881f62e4f9e5a522a68986c7e791773", "parents": [ "0431f4adf181e09503e7fb9d3677e79d45f31a08" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Apr 25 11:41:45 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Apr 25 11:56:23 2016 -0700" }, "message": "Fix gapless SBR\n\nPadding and delay in the file are expressed in terms of the base\nsample rate, not in terms of the (doubled) SBR rate.\n\nChange-Id: I3b59ec6281889d24a888c6a079731b05a120807f\n" }, { "commit": "0f75d202d4c2f8bc190e5356fd00073363a76845", "tree": "f46d92ad5a1dfe8e08fa8c727f2249d8b13afd46", "parents": [ "ce2bb8f9d2a612d530039c2985564ef0b1be5bfb", "35443e32bfe0960dc6a6564426054b104977b143" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Apr 25 18:30:36 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 25 18:30:36 2016 +0000" }, "message": "Merge \"Fix overflow in PCR calculations\" into nyc-dev\nam: 35443e3\n\n* commit \u002735443e32bfe0960dc6a6564426054b104977b143\u0027:\n Fix overflow in PCR calculations\n\nChange-Id: I1bda281a4cc1567e4588ad27a7bf705eb06d7f46\n" }, { "commit": "35443e32bfe0960dc6a6564426054b104977b143", "tree": "417609276d38826b186d7b23e1ef5a001b165f89", "parents": [ "8986b4d50c8d46de2a8950cb23fcc4138df67191", "19cec89f8b05fd05f8034ee1a4cd39ee09c33f02" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Apr 25 18:16:16 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 25 18:16:16 2016 +0000" }, "message": "Merge \"Fix overflow in PCR calculations\" into nyc-dev" }, { "commit": "ce2bb8f9d2a612d530039c2985564ef0b1be5bfb", "tree": "50c543027318f7c0d792ec45f91eea4abfaf3c9a", "parents": [ "9d6176987c66fc322f5c9527bf56b8e110e4e438", "8986b4d50c8d46de2a8950cb23fcc4138df67191" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Sat Apr 23 00:12:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 23 00:12:10 2016 +0000" }, "message": "Merge \"NuPlayer: ignore stale message for teardown.\" into nyc-dev\nam: 8986b4d\n\n* commit \u00278986b4d50c8d46de2a8950cb23fcc4138df67191\u0027:\n NuPlayer: ignore stale message for teardown.\n\nChange-Id: Id539b8b717f809d2a99104259311e52a9858aea2\n" }, { "commit": "8986b4d50c8d46de2a8950cb23fcc4138df67191", "tree": "5f057950b53689f2508d47802d087aab7ec65da7", "parents": [ "bfb69e61f16ccb011926dbefa90725fb73243c7f", "8456ddd1e4c3daa8f32ea1cbb94c70275e5a22f5" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Sat Apr 23 00:06:31 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Apr 23 00:06:31 2016 +0000" }, "message": "Merge \"NuPlayer: ignore stale message for teardown.\" into nyc-dev" }, { "commit": "995d39cc23949569ea3a689985812ee923da5d4f", "tree": "fe211c51d284274e46423bdc8b9b616c081dba39", "parents": [ "7815d4fe67059eabe14541c4fd0fb5e095e0d6e0", "c90ba3056712a9c0ef6383fb00dc3b9c9b0edbc7" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 23:38:35 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 23:38:35 2016 +0000" }, "message": "Merge \"DO NOT MERGE Verify OMX buffer sizes prior to access\" into lmp-mr1-dev am: 0822864\nam: c90ba30\n\n* commit \u0027c90ba3056712a9c0ef6383fb00dc3b9c9b0edbc7\u0027:\n DO NOT MERGE Verify OMX buffer sizes prior to access\n\nChange-Id: I42551c5f62380f422257f80a933ccd301674a041\n" }, { "commit": "8456ddd1e4c3daa8f32ea1cbb94c70275e5a22f5", "tree": "0b936976fc02bd6e96be2645c3395a0922b3db44", "parents": [ "122f45dbfeef9672231bb94eabb7f223d4b0241e" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Apr 22 14:46:43 2016 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Apr 22 15:18:37 2016 -0700" }, "message": "NuPlayer: ignore stale message for teardown.\n\nBug: 28121584\nChange-Id: I9df088b4d99ebae38c06a1138f3d66b31bf67529\n" }, { "commit": "16bacd9c825b99bbf53b42271f9dc2546347154b", "tree": "1f7cf057668d6d5ebf5cc454e17a2e448465e63f", "parents": [ "d966c6c024dee77ab3d0812acd3cce3dfef3c606", "861f358a4b420517c2fbc9a33558fe5c964ccbd8" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 18:48:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 18:48:55 2016 +0000" }, "message": "Merge \"More OMX struct checking\" into mnc-dev am: 4040b13b07 am: 05202f5 am: ff5d1bb am: 8b5f271\nam: 861f358\n\n* commit \u0027861f358a4b420517c2fbc9a33558fe5c964ccbd8\u0027:\n More OMX struct checking\n\nChange-Id: Iba1ebfe17aeabd5a22b1ae72eb6017d7471e6303\n" }, { "commit": "861f358a4b420517c2fbc9a33558fe5c964ccbd8", "tree": "07fa51e0d6a9c92be5227c385407b92df87981a6", "parents": [ "7d1daf4ff0f2f1127581a279c6c5a9f92ec20966", "8b5f271f006dc07d2875bfebe32f59e8f1230ab2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 18:46:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 18:46:16 2016 +0000" }, "message": "Merge \"More OMX struct checking\" into mnc-dev am: 4040b13b07 am: 05202f5 am: ff5d1bb\nam: 8b5f271\n\n* commit \u00278b5f271f006dc07d2875bfebe32f59e8f1230ab2\u0027:\n More OMX struct checking\n\nChange-Id: I6e98cb098254e9ad10ae7d4ae3eaf84b3f76928c\n" }, { "commit": "8b5f271f006dc07d2875bfebe32f59e8f1230ab2", "tree": "ec2e6239163e9551317aaa0afd7178a45023b461", "parents": [ "54355d98e0a4417cde0479e3fd4399edbc11586b", "ff5d1bb0ea9e377cae80c9255758b037692ab25d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 18:38:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 18:38:13 2016 +0000" }, "message": "Merge \"More OMX struct checking\" into mnc-dev am: 4040b13b07 am: 05202f5\nam: ff5d1bb\n\n* commit \u0027ff5d1bb0ea9e377cae80c9255758b037692ab25d\u0027:\n More OMX struct checking\n\nChange-Id: Ic831540ff9a78c16e65c07dda7c6095c5171f194\n" }, { "commit": "ff5d1bb0ea9e377cae80c9255758b037692ab25d", "tree": "1faded6fdb6346752925bbdbfacaed3e24d8242b", "parents": [ "64cb47eebab3ca226781cc5b5147b739883ed8d7", "05202f57f291d78c502bdf4228bd871ba224b7df" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 18:35:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 18:35:51 2016 +0000" }, "message": "Merge \"More OMX struct checking\" into mnc-dev am: 4040b13b07\nam: 05202f5\n\n* commit \u002705202f57f291d78c502bdf4228bd871ba224b7df\u0027:\n More OMX struct checking\n\nChange-Id: Id4afbbc1ed61a030bd7376fec96db209f51019ec\n" }, { "commit": "05202f57f291d78c502bdf4228bd871ba224b7df", "tree": "8395d6958c63d46698cc019bae4288856b3cc51c", "parents": [ "f0eb48c8964006ec446451dbdb35f4dc9cbf0d04", "4040b13b07b5990cd1eb14ff8661aee18d4c3ab9" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 18:31:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 18:31:29 2016 +0000" }, "message": "Merge \"More OMX struct checking\" into mnc-dev\nam: 4040b13b07\n\n* commit \u00274040b13b07b5990cd1eb14ff8661aee18d4c3ab9\u0027:\n More OMX struct checking\n\nChange-Id: Ib9e2bf593ce250b01f8e5dabcae557bd719e12e1\n" }, { "commit": "f54f5b54bd5bd78e045fbf9dbc6462d0720f1ff6", "tree": "ed0c07ea2690ce9ca709c05277ecf730a02251c5", "parents": [ "63e9b573530837702e42e00900407bbe9fdae952", "e25ff0130ef9fa184afb87e92c184172c8a96f71" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 18:15:07 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 18:15:07 2016 +0000" }, "message": "Merge \"DO NOT MERGE More OMX struct checking\" into klp-dev am: c002126cb0\nam: e25ff0130e\n\n* commit \u0027e25ff0130ef9fa184afb87e92c184172c8a96f71\u0027:\n DO NOT MERGE More OMX struct checking\n\nChange-Id: Ia9767e906a247c330031837c3b0b6415e319c836\n" }, { "commit": "4040b13b07b5990cd1eb14ff8661aee18d4c3ab9", "tree": "2ee3a1ba27e628e107620b5df9e196bd9e6e0d7b", "parents": [ "7a33c062046a6b38cbe12c2f9928a0f1f0e82ebc", "a21bed3d626d148e584bdddeeecf287b782b3fcb" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 18:11:02 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 22 18:11:02 2016 +0000" }, "message": "Merge \"More OMX struct checking\" into mnc-dev" }, { "commit": "c002126cb05b1d640c0a0b51bc0de810a62ab2b1", "tree": "619a3f31678c250a0d2a24999a9c382e297d1f51", "parents": [ "70dec4dc7d1d813afaff58fb26b0fd7127e897bf", "1fdf00971ba4419f102e5e2c29975ae238eaaa3c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 17:45:56 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 22 17:45:56 2016 +0000" }, "message": "Merge \"DO NOT MERGE More OMX struct checking\" into klp-dev" }, { "commit": "d966c6c024dee77ab3d0812acd3cce3dfef3c606", "tree": "9d0322ec7baf43f371dddf2d5d4f61f834c2fb0b", "parents": [ "5501207ce67869277f939422b3b0e192609c20ea", "7d1daf4ff0f2f1127581a279c6c5a9f92ec20966" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Apr 22 17:29:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 17:29:58 2016 +0000" }, "message": "Merge \"HLS: clear ATSParser fully on explicit discontinuity\" into nyc-dev\nam: 7d1daf4ff0\n\n* commit \u00277d1daf4ff0f2f1127581a279c6c5a9f92ec20966\u0027:\n HLS: clear ATSParser fully on explicit discontinuity\n\nChange-Id: I2e5d36a2481f0f9c1a296bc61b4b6774a0c96da9\n" }, { "commit": "5501207ce67869277f939422b3b0e192609c20ea", "tree": "cb3d36b9500b6ccae43003df0df679df748b7d8a", "parents": [ "e662bd5c9957c0bc4a17455c03d9b08731a0e079", "9c1b24689f6b75713509e9be9a8443df35e74416" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Apr 22 17:29:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 17:29:58 2016 +0000" }, "message": "Merge \"HLS: left zero fill 128 bit AES IV\" into nyc-dev\nam: 9c1b24689f\n\n* commit \u00279c1b24689f6b75713509e9be9a8443df35e74416\u0027:\n HLS: left zero fill 128 bit AES IV\n\nChange-Id: I90f07f91c8a2f956f25691c8c44d9f91bb991c26\n" }, { "commit": "e662bd5c9957c0bc4a17455c03d9b08731a0e079", "tree": "6f9b106bb38ebddae350a259da780223305e455b", "parents": [ "6ff859ae521d66bba2a58659ff8f9ebaf9dcc514", "10486e556d9314f4a60a3576a843498a6ef910d3" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Apr 22 17:29:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 17:29:57 2016 +0000" }, "message": "Merge \"HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly\" into nyc-dev\nam: 10486e556d\n\n* commit \u002710486e556d9314f4a60a3576a843498a6ef910d3\u0027:\n HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly\n\nChange-Id: Ic2dc46bbb8aab673a1da71ae8ae1242f5b52015c\n" }, { "commit": "7d1daf4ff0f2f1127581a279c6c5a9f92ec20966", "tree": "897c68ac9963c359adaef798b67d4afeaf104f77", "parents": [ "9c1b24689f6b75713509e9be9a8443df35e74416", "a722375a32e9a0febc3770513647dc32bf88ccc0" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Apr 22 17:16:44 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 22 17:16:44 2016 +0000" }, "message": "Merge \"HLS: clear ATSParser fully on explicit discontinuity\" into nyc-dev" }, { "commit": "9c1b24689f6b75713509e9be9a8443df35e74416", "tree": "d31309aed26a83fafa47a90a2041a5aa27f49381", "parents": [ "10486e556d9314f4a60a3576a843498a6ef910d3", "4a3108a4464490a57bbe2854d1b47df8336bd471" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Apr 22 17:16:34 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 22 17:16:35 2016 +0000" }, "message": "Merge \"HLS: left zero fill 128 bit AES IV\" into nyc-dev" }, { "commit": "10486e556d9314f4a60a3576a843498a6ef910d3", "tree": "91722d91355804a9a529112d6e38c45fd765d131", "parents": [ "5ec9c98272753b9f4cd16d5a9e2d9f4d4b2c164b", "985746d11c888e110d5ea34d815efeb1115de0c6" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Apr 22 17:16:23 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 22 17:16:23 2016 +0000" }, "message": "Merge \"HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly\" into nyc-dev" }, { "commit": "a21bed3d626d148e584bdddeeecf287b782b3fcb", "tree": "946d090cc5f110fbbc78088228bd2d9943238ac7", "parents": [ "3b1a43598a7baae8f7889a6b0926305b837fd5d5" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 07:55:54 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 15:19:05 2016 +0000" }, "message": "More OMX struct checking\n\nThese were lost due to bad merges.\n\nBug: 27207275\nChange-Id: I2fd6fa0edda83ff8d5db07fce34db2f1df0a1735\n" }, { "commit": "1fdf00971ba4419f102e5e2c29975ae238eaaa3c", "tree": "4829dee6c08f32c3688c3080b34b25f63397c3f4", "parents": [ "a3dd713893658baf50df88b261aba83bb0c40687" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 07:54:04 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 07:56:36 2016 -0700" }, "message": "DO NOT MERGE More OMX struct checking\n\nThese were lost due to bad merges.\n\nBug: 27207275\nChange-Id: Ia0f403d7aef79a8e0ac618eb49b34dbf9faa25c2\n" }, { "commit": "dfb280d3975afdce4da87602577d2814cb9eb30d", "tree": "fc10f72928e6cbbae32a90461b6982d383d16740", "parents": [ "ef21738066caa918b34c57844d3e0f6cebbce86a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 07:55:10 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 07:56:18 2016 -0700" }, "message": "DO NOT MERGE More OMX struct checking\n\nThese were lost due to bad merges.\n\nBug: 27207275\nChange-Id: Idc7a9fc75376a88b91e9e259d664d6ee54c77330\n" }, { "commit": "67ef30185837950144d30e5a73d852eb9a7a0a89", "tree": "b31bc980687bd6331300007053a0da93013a1d84", "parents": [ "59f9cc2a46281fd9e491f3e6631d3a34b9f6c84d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Feb 29 12:47:20 2016 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Apr 22 07:52:39 2016 -0700" }, "message": "DO NOT MERGE Verify OMX buffer sizes prior to access\n\nBug: 27207275\nChange-Id: I4412825d1ee233d993af0a67708bea54304ff62d\n" }, { "commit": "6ff859ae521d66bba2a58659ff8f9ebaf9dcc514", "tree": "9e422d404263fe6c29f3e7d82412c2cb2e5fa58a", "parents": [ "e6baf22d0741ad9e750d6e806d30372d4a124d31", "5ec9c98272753b9f4cd16d5a9e2d9f4d4b2c164b" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Apr 22 01:40:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 22 01:40:59 2016 +0000" }, "message": "Merge \"NuPlayerRenderer: Ensure cancelAudioOffloadPauseTimeout cancels timeout\" into nyc-dev\nam: 5ec9c98272\n\n* commit \u00275ec9c98272753b9f4cd16d5a9e2d9f4d4b2c164b\u0027:\n NuPlayerRenderer: Ensure cancelAudioOffloadPauseTimeout cancels timeout\n\nChange-Id: I50965490edba5bcc906516d502a4f90d50f9dfe6\n" }, { "commit": "5ec9c98272753b9f4cd16d5a9e2d9f4d4b2c164b", "tree": "bd5bdc98a1a044b38a6882a51a99e5f4eb432ddd", "parents": [ "17cb0490ffffafc13c47260d51bbcbf2509e1d79", "21afe805580c1fdf394415648fba8e1c482def60" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Apr 22 01:32:20 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 22 01:32:21 2016 +0000" }, "message": "Merge \"NuPlayerRenderer: Ensure cancelAudioOffloadPauseTimeout cancels timeout\" into nyc-dev" }, { "commit": "4a3108a4464490a57bbe2854d1b47df8336bd471", "tree": "6e37634b08118873837ffc9e94d005c3254d5f91", "parents": [ "4178befd29da90abe0e2fd6f58b5caa1c225badd" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 21 14:42:59 2016 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 21 17:31:52 2016 -0700" }, "message": "HLS: left zero fill 128 bit AES IV\n\nBug: 28320768\nChange-Id: I9195b87f742f83d3e4c4201642463881303ae3e6\n" }, { "commit": "a722375a32e9a0febc3770513647dc32bf88ccc0", "tree": "e83ac38c3eaa1015c379974cb33d9e7d0d19c1d3", "parents": [ "4178befd29da90abe0e2fd6f58b5caa1c225badd" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 21 14:56:38 2016 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 21 17:31:46 2016 -0700" }, "message": "HLS: clear ATSParser fully on explicit discontinuity\n\nAfter a discontinuity stream PIDs might change in a way that we cannot\nrecover; creating a brand new parser avoids this potential issue.\n\nBug: 28320768\nChange-Id: I387a9cd2371b11c2b1c0b8b81b85999033e22f7f\n" }, { "commit": "985746d11c888e110d5ea34d815efeb1115de0c6", "tree": "53d9a0415c5e9ace8ed102688d6aeebdbe8d2b7d", "parents": [ "4178befd29da90abe0e2fd6f58b5caa1c225badd" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 21 16:21:36 2016 -0700" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Apr 21 17:31:37 2016 -0700" }, "message": "HLS: handle EXT-X-DISCONTINUITY-SEQUENCE correctly\n\nBecause EXT-X-DISCONTINUITY is a prefix of EXT-X-DISCONTINUITY-SEQUENCE,\nputting EXT-X-DISCONTINUITY first in an if-startsWith/else-if-startsWith\nblock would cause EXT-X-DISCONTINUITY-SEQUENCE be parsed as\nEXT-X-DISCONTINUITY.\n\nBug: 28320768\nChange-Id: I667b97b0e2050324eec26779e6a2dae7900e96b8\n" }, { "commit": "21afe805580c1fdf394415648fba8e1c482def60", "tree": "940129ef346b437a21128a534b64e54591128b3b", "parents": [ "5cc32c5ee9caa11a3c9cd205c42463ead28ec87e" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Apr 21 14:52:05 2016 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Apr 21 14:52:05 2016 -0700" }, "message": "NuPlayerRenderer: Ensure cancelAudioOffloadPauseTimeout cancels timeout\n\nBug: 28121584\nChange-Id: Ic8887851544f769e0cd0717d97075931ab73df3f\n" }, { "commit": "e6baf22d0741ad9e750d6e806d30372d4a124d31", "tree": "1415d44f7192aaad61579250427842898cce735b", "parents": [ "19665dc9307e9b18f188dea4001fe24adbda4500", "17cb0490ffffafc13c47260d51bbcbf2509e1d79" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 19:20:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 19:20:08 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204 am: f0eb48c896 am: 64cb47eeba am: 54355d98e0\nam: 17cb0490ff\n\n* commit \u002717cb0490ffffafc13c47260d51bbcbf2509e1d79\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: If34212a5485d9040cc502467658093f90376b98b\n" }, { "commit": "17cb0490ffffafc13c47260d51bbcbf2509e1d79", "tree": "5ba6b649efd5c237f6df50ce4536bf8ed9d26d0c", "parents": [ "f3aaf48fe2ca7f9886f1e4d00db16c575e9a97c9", "54355d98e0a4417cde0479e3fd4399edbc11586b" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 19:17:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 19:17:59 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204 am: f0eb48c896 am: 64cb47eeba\nam: 54355d98e0\n\n* commit \u002754355d98e0a4417cde0479e3fd4399edbc11586b\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: If0135d9ba79df9e71803f34a3c80da03f723d655\n" }, { "commit": "54355d98e0a4417cde0479e3fd4399edbc11586b", "tree": "0e6da380f3e4b179ac32b1103b889161820828c3", "parents": [ "7fe9a728e8c80faa4a92f6da585ee6f6a41473f0", "64cb47eebab3ca226781cc5b5147b739883ed8d7" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 19:15:32 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 19:15:32 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204 am: f0eb48c896\nam: 64cb47eeba\n\n* commit \u002764cb47eebab3ca226781cc5b5147b739883ed8d7\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: I584bd7c2688d837a3ed502d1f29f20d14d6561c5\n" }, { "commit": "64cb47eebab3ca226781cc5b5147b739883ed8d7", "tree": "981a0301aa6a7514208ddb9ca883aaf69be1fe1a", "parents": [ "fbab2e6efa2255bb0ce99c946ebd7b6712338a1c", "f0eb48c8964006ec446451dbdb35f4dc9cbf0d04" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 19:13:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 19:13:14 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be am: 7a33c06204\nam: f0eb48c896\n\n* commit \u0027f0eb48c8964006ec446451dbdb35f4dc9cbf0d04\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: Icad72619b7914f06c601d1c79198942611e4a1af\n" }, { "commit": "f0eb48c8964006ec446451dbdb35f4dc9cbf0d04", "tree": "4a4c9f5f64d8c2796ab672cda77f981c3ef9635a", "parents": [ "5ffd5fe40964cbf6c2fa0f32658ab54f4698a06d", "7a33c062046a6b38cbe12c2f9928a0f1f0e82ebc" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 19:10:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 19:10:55 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007 am: 9b449c48be\nam: 7a33c06204\n\n* commit \u00277a33c062046a6b38cbe12c2f9928a0f1f0e82ebc\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: I1bf9fdd3c59b48e661e3dd47386d3aae716609ec\n" }, { "commit": "7a33c062046a6b38cbe12c2f9928a0f1f0e82ebc", "tree": "4de7c8e5f91463c086a7745399edb5c2ae5def74", "parents": [ "3b1a43598a7baae8f7889a6b0926305b837fd5d5", "9b449c48bea200b1f642148797a3bb43f555356d" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 19:08:42 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 19:08:42 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46 am: 9be65cb007\nam: 9b449c48be\n\n* commit \u00279b449c48bea200b1f642148797a3bb43f555356d\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: I6c2a13f8844d2405da3ef14ac8f960734419fd07\n" }, { "commit": "9b449c48bea200b1f642148797a3bb43f555356d", "tree": "84ec0ad69d4711dab32fe8a45c7b19cf708ecd05", "parents": [ "fa64a212fd03bc6827d5e9af69776f55ddc76c68", "9be65cb007a1525cae776c155144d73e23f10ada" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 19:06:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 19:06:26 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353 am: ef21738066 am: 59f9cc2a46\nam: 9be65cb007\n\n* commit \u00279be65cb007a1525cae776c155144d73e23f10ada\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: Icc2ba78e6bd4c4fbd401c13c8d09e5f5eb686373\n" }, { "commit": "59f9cc2a46281fd9e491f3e6631d3a34b9f6c84d", "tree": "75d24f91a2451701e450d7467dba6f1141a2c098", "parents": [ "ece67a933004ba370258156194d8141902f994a9", "ef21738066caa918b34c57844d3e0f6cebbce86a" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 19:01:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 19:01:49 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9 am: 63e9b57353\nam: ef21738066\n\n* commit \u0027ef21738066caa918b34c57844d3e0f6cebbce86a\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: I32d931ef1d2ac785f5d5e024786cb54ca833dbf7\n" }, { "commit": "ef21738066caa918b34c57844d3e0f6cebbce86a", "tree": "3746b25c34f7791546d95bbb309591e06a651f5e", "parents": [ "cbc0d3ac143082dffaaf03b317b012590abbfbbb", "63e9b573530837702e42e00900407bbe9fdae952" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 18:59:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 18:59:33 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d am: a1e309beb9\nam: 63e9b57353\n\n* commit \u002763e9b573530837702e42e00900407bbe9fdae952\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: Idcf74c810152b7160cf99aa25fe664c6b40f0750\n" }, { "commit": "63e9b573530837702e42e00900407bbe9fdae952", "tree": "c28f643ca958df09c553277ea49e0fe4de3b5886", "parents": [ "9345299e27e68b524c4b606d178802a4e7289aa1", "a1e309beb98e8fb35422102717af4f973ef1f34b" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 21 18:57:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Apr 21 18:57:16 2016 +0000" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. am: 70dec4dc7d\nam: a1e309beb9\n\n* commit \u0027a1e309beb98e8fb35422102717af4f973ef1f34b\u0027:\n SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.\n\nChange-Id: I1dd3ffd9a489453d0f66c0344f52c6efecf31b2e\n" }, { "commit": "70dec4dc7d1d813afaff58fb26b0fd7127e897bf", "tree": "03cc0e0abc2fb719834d94e6b5b66134d2b8a1f6", "parents": [ "7cab953629b615cfe5fec8f56266996bc17307b5" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Apr 20 15:51:48 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Apr 20 16:01:17 2016 -0700" }, "message": "SampleTable.cpp: Fixed a regression caused by a fix for bug\n28076789.\n\nDetail: Before the original fix\n(Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9) for 28076789, the\ncode allowed a time-to-sample table size to be 0. The change\nmade in that fix disallowed such situation, which in fact should\nbe allowed. This current patch allows it again while maintaining\nthe security of the previous fix.\n\nBug: 28288202\nBug: 28076789\nChange-Id: I1c9a60c7f0cfcbd3d908f24998dde15d5136a295\n" }, { "commit": "19cec89f8b05fd05f8034ee1a4cd39ee09c33f02", "tree": "91ea216fe9ecc8b50236a226ca3dbcfeca85ce61", "parents": [ "cc95bcf0fe6de6632fc38306efb0035d4e36423b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Apr 20 15:56:53 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Apr 20 15:56:53 2016 -0700" }, "message": "Fix overflow in PCR calculations\n\nBug: 28283706\nChange-Id: I46fe99f43433a1f3a61e168136e17beb13b92156\n" }, { "commit": "a6849d01341f5eb84ff691a90458e67b5aee619e", "tree": "5dd0d6caec0e1cd668e3b9d66acd9b2549122f0c", "parents": [ "5fb71f62474c92206dd068b725dab0572c9ede95", "cc95bcf0fe6de6632fc38306efb0035d4e36423b" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Apr 20 21:07:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 20 21:07:13 2016 +0000" }, "message": "Merge \"Add UK ringback tone\" into nyc-dev\nam: cc95bcf\n\n* commit \u0027cc95bcf0fe6de6632fc38306efb0035d4e36423b\u0027:\n Add UK ringback tone\n\nChange-Id: Ia32c710b009a779bb3fa621e6a2ece151fd71f3b\n" }, { "commit": "cc95bcf0fe6de6632fc38306efb0035d4e36423b", "tree": "dcc163b819ab2ace1d41b8d32d80e5d6293f7708", "parents": [ "eb7f3940044effc6a8b313a73134b5cc2156068c", "e7b4463fcd2597b8a17e776648396e85853c25d9" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Apr 20 17:12:17 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 20 17:12:17 2016 +0000" }, "message": "Merge \"Add UK ringback tone\" into nyc-dev" }, { "commit": "e7b4463fcd2597b8a17e776648396e85853c25d9", "tree": "4672c5e2c728e1330e6b5c53f7642962b74681e9", "parents": [ "0631aee95c5a98fb2dc0a45f093f9bd0cfbe463f" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Tue Apr 19 16:07:49 2016 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Tue Apr 19 17:17:23 2016 -0700" }, "message": "Add UK ringback tone\n\nAdd the UK ringback tone for when the device is in\nthe UK and the network declines to play a ringback tone.\n\nChange-Id: Iecbc420dd18b019e9201745a9ddc84b060dc9dba\nFix: 26583561\n" } ], "next": "5fb71f62474c92206dd068b725dab0572c9ede95" }