)]}' { "log": [ { "commit": "68edcad7d1619a648e0988ac40cc23e61200c2a2", "tree": "e66a86bc2e119c4724106723cf8116b64d06beca", "parents": [ "a7daa16ee5c2ec9cbb1b4c9dd195cbf9bb0173f7", "a0991fea7b7047206ba8da573952d0c19d1bc4e7" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jun 01 11:09:20 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 01 11:09:20 2012 -0700" }, "message": "am a0991fea: am 0c22272f: Merge \"Pipe throttle based on requested frame count\" into jb-dev\n\n* commit \u0027a0991fea7b7047206ba8da573952d0c19d1bc4e7\u0027:\n Pipe throttle based on requested frame count\n" }, { "commit": "a0991fea7b7047206ba8da573952d0c19d1bc4e7", "tree": "cf4931514f4b3a04f9d8a85af8116106fee96d5a", "parents": [ "c9bdf9b442bd6bb8f59e8e25c145ac625ac07c54", "0c22272f1c97fd4b7e106030a1fd5e6b50680b61" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jun 01 11:06:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 01 11:06:38 2012 -0700" }, "message": "am 0c22272f: Merge \"Pipe throttle based on requested frame count\" into jb-dev\n\n* commit \u00270c22272f1c97fd4b7e106030a1fd5e6b50680b61\u0027:\n Pipe throttle based on requested frame count\n" }, { "commit": "0c22272f1c97fd4b7e106030a1fd5e6b50680b61", "tree": "0b27f53c60c0e20d3e06d0fa7eb1f8e04ff6697f", "parents": [ "dadc0ddbfe309086801b479ddc91c55eeb2a9cbb", "820ba70df8ba595ae9055dfd34fdbfa32f70f14d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jun 01 11:04:43 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 01 11:04:43 2012 -0700" }, "message": "Merge \"Pipe throttle based on requested frame count\" into jb-dev" }, { "commit": "a7daa16ee5c2ec9cbb1b4c9dd195cbf9bb0173f7", "tree": "6a981de7bb80eba0f1521e4e7ff0c755299445ee", "parents": [ "bcba3b909f35edc06626d09c568fc833b9701307", "a189097d0c96fac9afa86e644312ffbb0027b124" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Jun 01 10:51:11 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 01 10:51:11 2012 -0700" }, "message": "Merge \"Camera2: Switch to using ATRACE\"" }, { "commit": "bcba3b909f35edc06626d09c568fc833b9701307", "tree": "9ae74eb417fbb12760d73bcba0e8602b8181c5fc", "parents": [ "4f35be8ba68f59303ddfb122bb5778f5531169cb", "c9bdf9b442bd6bb8f59e8e25c145ac625ac07c54" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jun 01 10:42:55 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 01 10:42:55 2012 -0700" }, "message": "am c9bdf9b4: am dadc0ddb: Part of fix for double spins \u0026 faster startup\n\n* commit \u0027c9bdf9b442bd6bb8f59e8e25c145ac625ac07c54\u0027:\n Part of fix for double spins \u0026 faster startup\n" }, { "commit": "c9bdf9b442bd6bb8f59e8e25c145ac625ac07c54", "tree": "7e4b38fbf9d59590bcde2686e69d304ed0f541d0", "parents": [ "721e18b75824eae3f3e79c915f4800ecad5dac80", "dadc0ddbfe309086801b479ddc91c55eeb2a9cbb" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Jun 01 10:41:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 01 10:41:13 2012 -0700" }, "message": "am dadc0ddb: Part of fix for double spins \u0026 faster startup\n\n* commit \u0027dadc0ddbfe309086801b479ddc91c55eeb2a9cbb\u0027:\n Part of fix for double spins \u0026 faster startup\n" }, { "commit": "dadc0ddbfe309086801b479ddc91c55eeb2a9cbb", "tree": "18baae93ed3d613c065c43267f9c47ac02a2325d", "parents": [ "27d33134130379cc91d936cdc742700311901a9d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu May 31 21:48:59 2012 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu May 31 21:48:59 2012 -0700" }, "message": "Part of fix for double spins \u0026 faster startup\n\nThis change alters the way that the media player\ninteracts with the Widevine adaptive streaming buffer\nlogic. It eliminates the reliance on cached buffer\nduration to determine pause/play states and instead\nonly generates buffering events when the widevine\nlibrary is not producing data (i.e. when it is\nbuffering). This eliminates unnecessary pause and\nrebuffer cycles, reducing startup time and the\nfrequency and duration of spinners.\n\nMulti-repo commit, depends on related changes in vendor/widevine\n\nChange-Id: I387db2decd83841775a8351bddf5a6381fe4104f\nrelated-to-bug:6503294\nrelated-to-bug:6463780\n" }, { "commit": "4f35be8ba68f59303ddfb122bb5778f5531169cb", "tree": "b8f41ed291b66d5ef0c1ab8628493bbf23eaba12", "parents": [ "00bb735e3716720e538eb3f45752bc9173a3b636", "721e18b75824eae3f3e79c915f4800ecad5dac80" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 31 20:01:36 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 31 20:01:36 2012 -0700" }, "message": "am 721e18b7: am 27d33134: Merge \"Do not keep audio wake lock when apps underrun.\" into jb-dev\n\n* commit \u0027721e18b75824eae3f3e79c915f4800ecad5dac80\u0027:\n Do not keep audio wake lock when apps underrun.\n" }, { "commit": "721e18b75824eae3f3e79c915f4800ecad5dac80", "tree": "37035a80c39e676fefac4b65e3d26f37e9682a20", "parents": [ "386f04ea89f858ae1a1865b6d92ae30a87930151", "27d33134130379cc91d936cdc742700311901a9d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 31 19:59:12 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 31 19:59:12 2012 -0700" }, "message": "am 27d33134: Merge \"Do not keep audio wake lock when apps underrun.\" into jb-dev\n\n* commit \u002727d33134130379cc91d936cdc742700311901a9d\u0027:\n Do not keep audio wake lock when apps underrun.\n" }, { "commit": "27d33134130379cc91d936cdc742700311901a9d", "tree": "4f6fd1c24c856b908a31040da0d72f3d0798434f", "parents": [ "cafc53c0ac77c2aa7564cea26120da6bc0c589f2", "df839841d2db4cb8e2acb10205b3942622b3e7a2" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 31 19:56:21 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 31 19:56:21 2012 -0700" }, "message": "Merge \"Do not keep audio wake lock when apps underrun.\" into jb-dev" }, { "commit": "00bb735e3716720e538eb3f45752bc9173a3b636", "tree": "ba43d61baf00658336e04d6d64fd37bc98247ded", "parents": [ "5c4dc385a4e214a5eef7fbcf1f7b0d0c37dc098d", "6db981c45a964f0d9df4c3451f064dff7954d78e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu May 31 18:34:22 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 31 18:34:22 2012 -0700" }, "message": "Merge \"Camera service: Minimally functional preview for camera 2 devices.\"" }, { "commit": "5c4dc385a4e214a5eef7fbcf1f7b0d0c37dc098d", "tree": "2ebe4039219b91810611355f3affd69300609219", "parents": [ "611f61998863d3a3ffae4e5f2b723b7319c59ddf", "386f04ea89f858ae1a1865b6d92ae30a87930151" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 31 18:06:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 31 18:06:04 2012 -0700" }, "message": "am 386f04ea: am cafc53c0: Fix another buffer overflow issue\n\n* commit \u0027386f04ea89f858ae1a1865b6d92ae30a87930151\u0027:\n Fix another buffer overflow issue\n" }, { "commit": "386f04ea89f858ae1a1865b6d92ae30a87930151", "tree": "c2c106526ffba112898e337b34982e1b9b4f3cb6", "parents": [ "3fc873706a73b0a6aa753057f1704988d6f1adf7", "cafc53c0ac77c2aa7564cea26120da6bc0c589f2" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 31 17:33:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 31 17:33:13 2012 -0700" }, "message": "am cafc53c0: Fix another buffer overflow issue\n\n* commit \u0027cafc53c0ac77c2aa7564cea26120da6bc0c589f2\u0027:\n Fix another buffer overflow issue\n" }, { "commit": "cafc53c0ac77c2aa7564cea26120da6bc0c589f2", "tree": "4ea43af46b70d18c4a7d6b827579888555b363a0", "parents": [ "83410a85993ad6f5f0c122036ff0bda42bf1d4f7" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 31 13:06:53 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 31 17:13:39 2012 -0700" }, "message": "Fix another buffer overflow issue\n\nUsing hard-coded length value easily leads to buffer overflow.\nRefactor the code a bit to make it more readable, and more\nextensible, and less subject to the buffer overflow coding error.\n\nPatch originally contributed by teng.hong@nxp.com\n\nChange-Id: Id262915302ccea8ae3b0121bf39890ab463aeeb7\nrelated-to-bug: 6328360\n" }, { "commit": "a189097d0c96fac9afa86e644312ffbb0027b124", "tree": "6f1b57686b9a7763a7bb1208827f5c0e56bc9176", "parents": [ "6db981c45a964f0d9df4c3451f064dff7954d78e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu May 31 11:18:52 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu May 31 15:52:14 2012 -0700" }, "message": "Camera2: Switch to using ATRACE\n\nBug: 6243944\nChange-Id: Ib2aa1875c72b20ae764d9de95b4122b736738df2\n" }, { "commit": "df839841d2db4cb8e2acb10205b3942622b3e7a2", "tree": "183ce49d98a66d866aeed85e98da6709206074ac", "parents": [ "83410a85993ad6f5f0c122036ff0bda42bf1d4f7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 31 14:27:14 2012 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 31 14:32:38 2012 -0700" }, "message": "Do not keep audio wake lock when apps underrun.\n\nDo not automatically restart an AudioTrack after an underrun\nif the callback is executed but no data is written by the app.\n\nBug 6541286.\n\nChange-Id: I11e7ab8dc968d7ff087058fec68f44490d3a7731\n" }, { "commit": "6db981c45a964f0d9df4c3451f064dff7954d78e", "tree": "44842725c8aed171117d6aa37ad059277f50068d", "parents": [ "611f61998863d3a3ffae4e5f2b723b7319c59ddf" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon May 21 18:54:30 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu May 31 12:43:17 2012 -0700" }, "message": "Camera service: Minimally functional preview for camera 2 devices.\n\n- Camera app starts up\n- Basic preview operation with defaults\n- Shutdown sequence is very minimal\n\nBug: 6243944\n\nChange-Id: I67673b7c1fc08956d218d99f9171e74a7a82bf07\n" }, { "commit": "611f61998863d3a3ffae4e5f2b723b7319c59ddf", "tree": "05a534a25b5e52f1a61f79eca67c329dab327ac6", "parents": [ "a383a7e03686d746612007e58a894779ae63e994" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu May 31 12:28:23 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 31 12:38:53 2012 -0700" }, "message": "Add basic Camera2Client dump, minor fixes to CameraService dump.\n\nBug: 6243944\nChange-Id: I52caaa6146050c38976768e99b0eeea1d13a3f51\n" }, { "commit": "a383a7e03686d746612007e58a894779ae63e994", "tree": "575144c3225b83759252f21c69a13b9a53dbc1c8", "parents": [ "529e888738a91ca70cbdeeabd982f8fb2947780c", "3fc873706a73b0a6aa753057f1704988d6f1adf7" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed May 30 19:26:31 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 30 19:26:31 2012 -0700" }, "message": "am 3fc87370: am 83410a85: Avoid prematurely terminating parsing when some track only has a single access unit\n\n* commit \u00273fc873706a73b0a6aa753057f1704988d6f1adf7\u0027:\n Avoid prematurely terminating parsing when some track only has a single access unit\n" }, { "commit": "3fc873706a73b0a6aa753057f1704988d6f1adf7", "tree": "7dd97de03e90121c1f61c4633bb3311548d95246", "parents": [ "8c07f7599a757fe51dc54253c480067cf01f13d3", "83410a85993ad6f5f0c122036ff0bda42bf1d4f7" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed May 30 19:23:58 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 30 19:23:58 2012 -0700" }, "message": "am 83410a85: Avoid prematurely terminating parsing when some track only has a single access unit\n\n* commit \u002783410a85993ad6f5f0c122036ff0bda42bf1d4f7\u0027:\n Avoid prematurely terminating parsing when some track only has a single access unit\n" }, { "commit": "83410a85993ad6f5f0c122036ff0bda42bf1d4f7", "tree": "6dd782ab059a9013ad1b1be957e6a3f19d8fc331", "parents": [ "3bdb4fbfc6730b6edc0b1ee980141574ed54ed8d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed May 30 17:34:24 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed May 30 19:07:45 2012 -0700" }, "message": "Avoid prematurely terminating parsing when some track only has a single access unit\n\nPatch was contributed by teng.hong@nxp.com\n\nChange-Id: I0f56361d839f18627e512d18e86f51b58b9b0e05\nrelated-to-bug: 6240789\n" }, { "commit": "820ba70df8ba595ae9055dfd34fdbfa32f70f14d", "tree": "e97d469bcac8dc241ed7f6690db31035a6f1493b", "parents": [ "4364d2d1fd712faed7e839b58fedba3f48f626d0" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 30 16:34:17 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed May 30 17:39:45 2012 -0700" }, "message": "Pipe throttle based on requested frame count\n\nNow does throttling based on the requested frame count, but\nstill permits overfilling pipe up to the rounded-up frame count.\nAlso still uses the larger frame count for non-blocking arithmetic.\n\nBug: 6585323\nChange-Id: Ic2420a071419905524a14c22ebe1ce0e32d70a9d\n" }, { "commit": "529e888738a91ca70cbdeeabd982f8fb2947780c", "tree": "09558a3153e26e706ac69b46f1b1ed9e6db04253", "parents": [ "c65abc64bff11b194a0b416ec66e44f5ed957dcf", "8c07f7599a757fe51dc54253c480067cf01f13d3" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 30 14:13:01 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 30 14:13:01 2012 -0700" }, "message": "am 8c07f759: am 3bdb4fbf: Merge \"audioflinger: fix effect problem during underrun\" into jb-dev\n\n* commit \u00278c07f7599a757fe51dc54253c480067cf01f13d3\u0027:\n audioflinger: fix effect problem during underrun\n" }, { "commit": "c65abc64bff11b194a0b416ec66e44f5ed957dcf", "tree": "230fef440b02f596ac649d35f7c92b28a3bbc909", "parents": [ "9d1e267c831b21dcfd380ce36de0e5837f94aab3", "3878fbedd8cd1f09aa2c1c2b6a44efd57c75e834" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed May 30 14:10:19 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 30 14:10:19 2012 -0700" }, "message": "am 3878fbed: am cc9833b5: Only send port settings changed if the number of channels and sample rate are both known to be valid.\n\n* commit \u00273878fbedd8cd1f09aa2c1c2b6a44efd57c75e834\u0027:\n Only send port settings changed if the number of channels and sample rate are both known to be valid.\n" }, { "commit": "8c07f7599a757fe51dc54253c480067cf01f13d3", "tree": "4b78889a4c2ccff82947d9db824dc54c9d44206f", "parents": [ "3878fbedd8cd1f09aa2c1c2b6a44efd57c75e834", "3bdb4fbfc6730b6edc0b1ee980141574ed54ed8d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 30 14:09:42 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 30 14:09:42 2012 -0700" }, "message": "am 3bdb4fbf: Merge \"audioflinger: fix effect problem during underrun\" into jb-dev\n\n* commit \u00273bdb4fbfc6730b6edc0b1ee980141574ed54ed8d\u0027:\n audioflinger: fix effect problem during underrun\n" }, { "commit": "3bdb4fbfc6730b6edc0b1ee980141574ed54ed8d", "tree": "0629fb88ed24815990afca3e04f4821e7b974336", "parents": [ "cc9833b5db0e96f12daddb90a747fd146627377d", "91b14c4c144d0cc957a427cffc02ba10d0615677" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 30 14:07:38 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 30 14:07:38 2012 -0700" }, "message": "Merge \"audioflinger: fix effect problem during underrun\" into jb-dev" }, { "commit": "3878fbedd8cd1f09aa2c1c2b6a44efd57c75e834", "tree": "845cbd11b43057cd5bcf461a071bbcb56f902cca", "parents": [ "7cc5eddcab55c4e039d1bfaa746961ca510939be", "cc9833b5db0e96f12daddb90a747fd146627377d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed May 30 14:07:19 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 30 14:07:19 2012 -0700" }, "message": "am cc9833b5: Only send port settings changed if the number of channels and sample rate are both known to be valid.\n\n* commit \u0027cc9833b5db0e96f12daddb90a747fd146627377d\u0027:\n Only send port settings changed if the number of channels and sample rate are both known to be valid.\n" }, { "commit": "9d1e267c831b21dcfd380ce36de0e5837f94aab3", "tree": "3ce090a7d0151b76e1b82214617cea58b56d5efc", "parents": [ "da4cb00ea329ac6d15d33ec67e85d76fed3154fa", "f69c70ded4316ea3ee504ac779bd024433ed4ef7" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed May 30 13:39:00 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 30 13:39:00 2012 -0700" }, "message": "Merge \"Camera service: Initialization for camera2 clients and devices\"" }, { "commit": "cc9833b5db0e96f12daddb90a747fd146627377d", "tree": "9381b975e84aee3deff7e9a51e193bd5b1e1b600", "parents": [ "4364d2d1fd712faed7e839b58fedba3f48f626d0" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed May 30 10:26:31 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed May 30 13:02:05 2012 -0700" }, "message": "Only send port settings changed if the number of channels and sample rate are both known to be valid.\n\nChange-Id: I9f8813eedc95db202488d8860cf485bdb8e69e11\nrelated-to-bug: 6553089\n" }, { "commit": "91b14c4c144d0cc957a427cffc02ba10d0615677", "tree": "dd7c1027319b6783cdc493bf4d37afb2537a2879", "parents": [ "91b0d43a27b3a1cebd75270f953f3fb9fa4f2047" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 30 12:30:29 2012 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 30 12:38:27 2012 -0700" }, "message": "audioflinger: fix effect problem during underrun\n\nWhen an audio track underruns, the input buffer of the\ncorresponding effect chain (if any) must be cleared, otherwise\naudio from previous mixer run will be fed again to the effect process\nfunction.\n\nBug 6551652.\n\nChange-Id: I5cd02196745f756c85af82d6937e9dc54369b37f\n" }, { "commit": "da4cb00ea329ac6d15d33ec67e85d76fed3154fa", "tree": "0d85e0ff49cf42cefc39ea4fc2a939427984f426", "parents": [ "4e23cdbf3e9e0f49fd0b0bc5ffe39dedac270ac4", "7cc5eddcab55c4e039d1bfaa746961ca510939be" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 30 10:17:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 30 10:17:25 2012 -0700" }, "message": "am 7cc5eddc: Reconcile with jb-release\n\n* commit \u00277cc5eddcab55c4e039d1bfaa746961ca510939be\u0027:\n Added some informational log messages to track down ANR related issues\n" }, { "commit": "7cc5eddcab55c4e039d1bfaa746961ca510939be", "tree": "d8a73778515fe25389c18909d738a8c1541a2090", "parents": [ "16c4cc1ecd9f907a34846117a3b3c7f59d9838ad", "cdbd0874a7f823c4081341d648aac0200aece066" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 30 10:13:13 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 30 10:13:13 2012 -0700" }, "message": "Reconcile with jb-release\n\nChange-Id: Ia7adbc708c661ef21a54ae85315de1b061d3cd53\n" }, { "commit": "cdbd0874a7f823c4081341d648aac0200aece066", "tree": "7eccbd1b6918f580e059ed1debcd14eead2e4fa5", "parents": [ "4364d2d1fd712faed7e839b58fedba3f48f626d0", "72b9d65607445ac7a887cd79191676137388de56" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed May 30 07:02:09 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed May 30 07:02:09 2012 -0700" }, "message": "merge in jb-release history after reset to jb-dev\n" }, { "commit": "72b9d65607445ac7a887cd79191676137388de56", "tree": "1e638c2f9f5575b752da2ec6313e8b2b5b1255d7", "parents": [ "ffe09e3e50ae9977eb2f998668721d3028e2287e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue May 29 14:10:05 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue May 29 19:48:09 2012 -0700" }, "message": "Added some informational log messages to track down ANR related issues\n\nChange-Id: Ie991c86e75d58f7eb4c9f524815c4de054d5f262\nrelated-to-bug: 6565826\n" }, { "commit": "4e23cdbf3e9e0f49fd0b0bc5ffe39dedac270ac4", "tree": "0d85e0ff49cf42cefc39ea4fc2a939427984f426", "parents": [ "c2f0cc7db9ddfe31fa92190fa035622ce78c93da", "16c4cc1ecd9f907a34846117a3b3c7f59d9838ad" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Tue May 29 17:35:42 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 17:35:42 2012 -0700" }, "message": "am 16c4cc1e: am 4364d2d1: Merge \"Precautionary logging to identify a potential infinite loop.\" into jb-dev\n\n* commit \u002716c4cc1ecd9f907a34846117a3b3c7f59d9838ad\u0027:\n Precautionary logging to identify a potential infinite loop.\n" }, { "commit": "16c4cc1ecd9f907a34846117a3b3c7f59d9838ad", "tree": "d8a73778515fe25389c18909d738a8c1541a2090", "parents": [ "c5a5ebde7d14292e54532692fc9082051119fb80", "4364d2d1fd712faed7e839b58fedba3f48f626d0" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Tue May 29 17:32:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 17:32:34 2012 -0700" }, "message": "am 4364d2d1: Merge \"Precautionary logging to identify a potential infinite loop.\" into jb-dev\n\n* commit \u00274364d2d1fd712faed7e839b58fedba3f48f626d0\u0027:\n Precautionary logging to identify a potential infinite loop.\n" }, { "commit": "4364d2d1fd712faed7e839b58fedba3f48f626d0", "tree": "7eccbd1b6918f580e059ed1debcd14eead2e4fa5", "parents": [ "c558fa89016ba9583049b84dc57e66a913cabde8", "503775e4e2c3ead1cbd3c10561e3bdd90f2e70d5" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Tue May 29 17:29:33 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 29 17:29:33 2012 -0700" }, "message": "Merge \"Precautionary logging to identify a potential infinite loop.\" into jb-dev" }, { "commit": "503775e4e2c3ead1cbd3c10561e3bdd90f2e70d5", "tree": "8069deada86d9e36e9a2bebbf29fbf2915422f26", "parents": [ "1adacd921319ec52fac1a4596ab6eaf8689e6a7d" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Tue May 29 16:41:49 2012 -0700" }, "committer": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Tue May 29 16:41:49 2012 -0700" }, "message": "Precautionary logging to identify a potential infinite loop.\n\nBug: 6571063\nChange-Id: I433659c6da333d5acd25ad03cb7f4a6ab0b6a4a5\n" }, { "commit": "c2f0cc7db9ddfe31fa92190fa035622ce78c93da", "tree": "d819773f26a795f5057b3e67c087d8cb536e96b7", "parents": [ "dd72c3017aef65d099460cfc6c0402bc2ba85bc3", "c5a5ebde7d14292e54532692fc9082051119fb80" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue May 29 16:33:40 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 16:33:40 2012 -0700" }, "message": "am c5a5ebde: am c558fa89: Added some informational log messages to track down ANR related issues\n\n* commit \u0027c5a5ebde7d14292e54532692fc9082051119fb80\u0027:\n Added some informational log messages to track down ANR related issues\n" }, { "commit": "c5a5ebde7d14292e54532692fc9082051119fb80", "tree": "04e06a8072d46aa50477f51667873a2b7b61af55", "parents": [ "89b7f7ff8e198916d79b0f59184bc5dd444a4dd4", "c558fa89016ba9583049b84dc57e66a913cabde8" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue May 29 16:29:26 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 16:29:26 2012 -0700" }, "message": "am c558fa89: Added some informational log messages to track down ANR related issues\n\n* commit \u0027c558fa89016ba9583049b84dc57e66a913cabde8\u0027:\n Added some informational log messages to track down ANR related issues\n" }, { "commit": "c558fa89016ba9583049b84dc57e66a913cabde8", "tree": "54648433057b5a9c053dc2f686c81d80f6a9eac6", "parents": [ "0bbf868d53f55646651db6717468faeac618859d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue May 29 14:10:05 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue May 29 14:10:05 2012 -0700" }, "message": "Added some informational log messages to track down ANR related issues\n\nChange-Id: Ie991c86e75d58f7eb4c9f524815c4de054d5f262\nrelated-to-bug: 6565826\n" }, { "commit": "f69c70ded4316ea3ee504ac779bd024433ed4ef7", "tree": "35a9f7b23fff4fb40321cf4c009d268bed27bea8", "parents": [ "dd72c3017aef65d099460cfc6c0402bc2ba85bc3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sun May 20 15:59:14 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue May 29 13:47:50 2012 -0700" }, "message": "Camera service: Initialization for camera2 clients and devices\n\n- Refactor initialization code to hide device type from CameraService\n- Add metadata queue class to Camera2Device\n- Initialization of Camera2Device, Camera2Client\n- Conversion from HAL2 device static metadata to camera API\n parameters.\n\nBug: 6243944\nChange-Id: I524145b45438e906d8493dae202704ce8f090aeb\n" }, { "commit": "dd72c3017aef65d099460cfc6c0402bc2ba85bc3", "tree": "e3f9aef36053aeef29e538a2b07575d9a65c4a51", "parents": [ "c9be8e558eba00cdb152102433b6873f3aff5c81", "89b7f7ff8e198916d79b0f59184bc5dd444a4dd4" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue May 29 13:45:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 13:45:11 2012 -0700" }, "message": "am 89b7f7ff: (-s ours) am 0bbf868d: Merge \"DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock\" into jb-dev\n\n* commit \u002789b7f7ff8e198916d79b0f59184bc5dd444a4dd4\u0027:\n DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock\n" }, { "commit": "89b7f7ff8e198916d79b0f59184bc5dd444a4dd4", "tree": "642541cf06e75efa58005fca63a0adf93261b041", "parents": [ "aeb1ce5fe2e23d89d2f3f00a7623741945d75b12", "0bbf868d53f55646651db6717468faeac618859d" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue May 29 13:42:17 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 13:42:17 2012 -0700" }, "message": "am 0bbf868d: Merge \"DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock\" into jb-dev\n\n* commit \u00270bbf868d53f55646651db6717468faeac618859d\u0027:\n DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock\n" }, { "commit": "0bbf868d53f55646651db6717468faeac618859d", "tree": "5e8cf6e31f1095163fcc97be680c4177f2e35b0a", "parents": [ "91b0d43a27b3a1cebd75270f953f3fb9fa4f2047", "09cf462a265c3e9bc84c518cc75d77a5b1d69012" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue May 29 13:39:41 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 29 13:39:41 2012 -0700" }, "message": "Merge \"DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock\" into jb-dev" }, { "commit": "c9be8e558eba00cdb152102433b6873f3aff5c81", "tree": "e3f9aef36053aeef29e538a2b07575d9a65c4a51", "parents": [ "11e76918956ac4d4a4a43c70e25552b38fdf0cf1", "aeb1ce5fe2e23d89d2f3f00a7623741945d75b12" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 29 11:40:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 11:40:45 2012 -0700" }, "message": "am aeb1ce5f: am 91b0d43a: Merge \"Unwedge ACodec if allocating output buffers fails while reconfiguring.\" into jb-dev\n\n* commit \u0027aeb1ce5fe2e23d89d2f3f00a7623741945d75b12\u0027:\n Unwedge ACodec if allocating output buffers fails while reconfiguring.\n" }, { "commit": "aeb1ce5fe2e23d89d2f3f00a7623741945d75b12", "tree": "3e6c67b365ab3a6b683b839ab38a113550b68c20", "parents": [ "35a144765f0403bf93765a01691c898e38b4ef55", "91b0d43a27b3a1cebd75270f953f3fb9fa4f2047" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 29 11:38:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 11:38:34 2012 -0700" }, "message": "am 91b0d43a: Merge \"Unwedge ACodec if allocating output buffers fails while reconfiguring.\" into jb-dev\n\n* commit \u002791b0d43a27b3a1cebd75270f953f3fb9fa4f2047\u0027:\n Unwedge ACodec if allocating output buffers fails while reconfiguring.\n" }, { "commit": "91b0d43a27b3a1cebd75270f953f3fb9fa4f2047", "tree": "4018b0914585b9bb5713a9b6af44b0d0275d8beb", "parents": [ "40fe18f20e07f3626ff23d89ebdd5113733e155d", "755b9861197f1566f916785ba7d35cf86fd5b2d5" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 29 11:36:08 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 29 11:36:08 2012 -0700" }, "message": "Merge \"Unwedge ACodec if allocating output buffers fails while reconfiguring.\" into jb-dev" }, { "commit": "755b9861197f1566f916785ba7d35cf86fd5b2d5", "tree": "05e919c891f387aa3a038d67ed5dba212543b86d", "parents": [ "6350e21e8947398a94402bc2969d13d407fbc3fb" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 29 11:33:29 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 29 11:33:29 2012 -0700" }, "message": "Unwedge ACodec if allocating output buffers fails while reconfiguring.\n\nChange-Id: I871cf639167c01860e65c0408d3ce935f8f8f1ea\nrelated-to-bug: 6571060\n" }, { "commit": "09cf462a265c3e9bc84c518cc75d77a5b1d69012", "tree": "9d3ae70459a1a6bf1aa6d3377e3f6dd1413b055b", "parents": [ "6350e21e8947398a94402bc2969d13d407fbc3fb" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue May 29 11:17:48 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue May 29 11:28:51 2012 -0700" }, "message": "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock\n\n- Caused by already held lock in camera service\n\n- Introduce one more lock, mICameraLock, to control access to camera\n client through ICamera binder interface.\n\n- mLock is released before calling HAL takePicture, allowing HAL\n callbacks to access camera client during takePicture processing.\n\nBug: 5804701\nChange-Id: Ibcef4857a2c844c964afefa70f9cdccdd0a55fd0\n" }, { "commit": "11e76918956ac4d4a4a43c70e25552b38fdf0cf1", "tree": "363a72e8a34c67e1ddf680b95563f45ec3b28660", "parents": [ "6f2e351fd2c4664fad9c0fdf8669c1b915a892e0", "35a144765f0403bf93765a01691c898e38b4ef55" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 29 11:20:24 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 11:20:24 2012 -0700" }, "message": "am 35a14476: am 40fe18f2: Force shutdown of the omx decoder even if it\\\u0027s in a wedged state...\n\n* commit \u002735a144765f0403bf93765a01691c898e38b4ef55\u0027:\n Force shutdown of the omx decoder even if it\u0027s in a wedged state...\n" }, { "commit": "35a144765f0403bf93765a01691c898e38b4ef55", "tree": "6f7f3c03a6478f69b2429765da636026a4d806cd", "parents": [ "49ce8ae3e4dc78b9ae093dcc20a584f7701d4e6c", "40fe18f20e07f3626ff23d89ebdd5113733e155d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 29 11:19:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 11:19:03 2012 -0700" }, "message": "am 40fe18f2: Force shutdown of the omx decoder even if it\\\u0027s in a wedged state...\n\n* commit \u002740fe18f20e07f3626ff23d89ebdd5113733e155d\u0027:\n Force shutdown of the omx decoder even if it\u0027s in a wedged state...\n" }, { "commit": "40fe18f20e07f3626ff23d89ebdd5113733e155d", "tree": "384cca4b5ac2be3da70ec556e338a1505fed3a25", "parents": [ "6350e21e8947398a94402bc2969d13d407fbc3fb" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 29 10:37:15 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 29 10:37:15 2012 -0700" }, "message": "Force shutdown of the omx decoder even if it\u0027s in a wedged state...\n\nChange-Id: I5899928a3df4bcf7715769992955a0b834db1e2f\nrelated-to-bug: 6571060\n" }, { "commit": "6f2e351fd2c4664fad9c0fdf8669c1b915a892e0", "tree": "4f118cca8acc492b49e7d8e85f6d08b08aa2a06d", "parents": [ "713468b9710b4cfb6e563c9f69e16a8a6372a5a4", "49ce8ae3e4dc78b9ae093dcc20a584f7701d4e6c" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue May 29 09:41:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 29 09:41:49 2012 -0700" }, "message": "am 49ce8ae3: Reconcile with jb-release nakasi-factoryrom-release\n\n* commit \u002749ce8ae3e4dc78b9ae093dcc20a584f7701d4e6c\u0027:\n audioflinger: change session check in createTrack.\n Revert \"Revert \"Revert to PV for AAC codec for FactoryROM.\"\"\n" }, { "commit": "49ce8ae3e4dc78b9ae093dcc20a584f7701d4e6c", "tree": "5054e6f4cb74c9ae47247667b56b4bae35e7fde7", "parents": [ "f8321d624f4bbbfcf01d59f346d3eb390f75f24c", "ffe09e3e50ae9977eb2f998668721d3028e2287e", "c2522525436414852d0d3f634765f452b00977e7" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue May 29 09:39:32 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue May 29 09:39:32 2012 -0700" }, "message": "Reconcile with jb-release nakasi-factoryrom-release\n\nChange-Id: I51f6059054379d1cc1cc4bc6080f3bb48cf77a48\n" }, { "commit": "ffe09e3e50ae9977eb2f998668721d3028e2287e", "tree": "2d3fa57414cf932b6ddbd7196ffc2472fa0e5729", "parents": [ "6350e21e8947398a94402bc2969d13d407fbc3fb", "aeef495a2de6bec7270d8400df03b2724937dca4" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue May 29 08:57:17 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue May 29 08:57:17 2012 -0700" }, "message": "merge in jb-release history after reset to jb-dev\n" }, { "commit": "713468b9710b4cfb6e563c9f69e16a8a6372a5a4", "tree": "4f118cca8acc492b49e7d8e85f6d08b08aa2a06d", "parents": [ "342fdb573ae0ca387e72b615129fc34ad275ca30", "f8321d624f4bbbfcf01d59f346d3eb390f75f24c" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri May 25 12:27:47 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 25 12:27:47 2012 -0700" }, "message": "am f8321d62: stagefright aacenc: Fix reading out of bounds in pow2_xy\n\n* commit \u0027f8321d624f4bbbfcf01d59f346d3eb390f75f24c\u0027:\n stagefright aacenc: Fix reading out of bounds in pow2_xy\n" }, { "commit": "f8321d624f4bbbfcf01d59f346d3eb390f75f24c", "tree": "5054e6f4cb74c9ae47247667b56b4bae35e7fde7", "parents": [ "f655483263128529bc01aa1c2e80c229a2d169b8" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri May 25 19:46:34 2012 +0300" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri May 25 12:19:43 2012 -0700" }, "message": "stagefright aacenc: Fix reading out of bounds in pow2_xy\n\nThis fixes cases where x was a large number, causing fPart to\nexceed the 32 bit signed integer range (while fitting in an\nunsigned 32 bit integer), making the table index a negative\nnumber.\n\nChange-Id: I674047db65f89148a93d218c138b42cd8305f80e\n" }, { "commit": "342fdb573ae0ca387e72b615129fc34ad275ca30", "tree": "f57b57a673b3297fbc6a4b7aa913320740154ffe", "parents": [ "c2adf7108037fc188915f47505ebbf8bfc7c82da", "f655483263128529bc01aa1c2e80c229a2d169b8" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Fri May 25 10:09:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 25 10:09:04 2012 -0700" }, "message": "am f6554832: am 6350e21e: Merge \"Property to enable AAC 5.1 pass-through.\" into jb-dev\n\n* commit \u0027f655483263128529bc01aa1c2e80c229a2d169b8\u0027:\n Property to enable AAC 5.1 pass-through.\n" }, { "commit": "f655483263128529bc01aa1c2e80c229a2d169b8", "tree": "b53d242d445b60c9c66720647f816cd6e9d90a20", "parents": [ "61b0ca86d3d853172ccc147256a64a9fd2ba6606", "6350e21e8947398a94402bc2969d13d407fbc3fb" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Fri May 25 10:06:24 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 25 10:06:24 2012 -0700" }, "message": "am 6350e21e: Merge \"Property to enable AAC 5.1 pass-through.\" into jb-dev\n\n* commit \u00276350e21e8947398a94402bc2969d13d407fbc3fb\u0027:\n Property to enable AAC 5.1 pass-through.\n" }, { "commit": "6350e21e8947398a94402bc2969d13d407fbc3fb", "tree": "2d3fa57414cf932b6ddbd7196ffc2472fa0e5729", "parents": [ "c9d0294e0526510267a0c4148a0dbc0449bed223", "1adacd921319ec52fac1a4596ab6eaf8689e6a7d" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Fri May 25 10:02:32 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 25 10:02:32 2012 -0700" }, "message": "Merge \"Property to enable AAC 5.1 pass-through.\" into jb-dev" }, { "commit": "1adacd921319ec52fac1a4596ab6eaf8689e6a7d", "tree": "56d78d6e7a6e66d82095e3387dacc923eac85963", "parents": [ "e737cda649acbfa43fc1b74612a83f2fac9aa449" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Wed May 23 00:00:53 2012 -0700" }, "committer": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Fri May 25 09:38:29 2012 -0700" }, "message": "Property to enable AAC 5.1 pass-through.\n\nBug: 6275957\nChange-Id: I8debdce872fc8287a4f6340f1790e02c075886e3\n" }, { "commit": "c2adf7108037fc188915f47505ebbf8bfc7c82da", "tree": "0b130d93354829f3382add68f7c68c4ab5345462", "parents": [ "55fddda7ae1cee9de86446e1842e072349de1bc4", "61b0ca86d3d853172ccc147256a64a9fd2ba6606" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri May 25 08:42:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 25 08:42:44 2012 -0700" }, "message": "am 61b0ca86: am c9d0294e: Merge \"Prevent occurences of clipping in loud downmixed scenes\" into jb-dev\n\n* commit \u002761b0ca86d3d853172ccc147256a64a9fd2ba6606\u0027:\n Prevent occurences of clipping in loud downmixed scenes\n" }, { "commit": "61b0ca86d3d853172ccc147256a64a9fd2ba6606", "tree": "45231cfa3691979fa60bd5f864628545ff057010", "parents": [ "41ced0ade8a90f071e85fe1cf49f073c0738e95a", "c9d0294e0526510267a0c4148a0dbc0449bed223" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri May 25 08:40:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 25 08:40:51 2012 -0700" }, "message": "am c9d0294e: Merge \"Prevent occurences of clipping in loud downmixed scenes\" into jb-dev\n\n* commit \u0027c9d0294e0526510267a0c4148a0dbc0449bed223\u0027:\n Prevent occurences of clipping in loud downmixed scenes\n" }, { "commit": "c9d0294e0526510267a0c4148a0dbc0449bed223", "tree": "714c51019368393d949860023e973058918b1132", "parents": [ "49fcd3cc0c0bf352c5c0516e53805278e94951ca", "aea2715e65994e665a3732551880419ba1cecc0d" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri May 25 08:38:53 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 25 08:38:53 2012 -0700" }, "message": "Merge \"Prevent occurences of clipping in loud downmixed scenes\" into jb-dev" }, { "commit": "aeef495a2de6bec7270d8400df03b2724937dca4", "tree": "930951e6490510ef9eeab7210c8f729950783bd5", "parents": [ "3587c3c77d924687608226271aeb3e70cb0731ff" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 24 11:07:14 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu May 24 22:41:51 2012 -0700" }, "message": "audioflinger: change session check in createTrack.\n\nDo not refuse to create a track on an output thread if the same session\nis present on another thread. It is now possible that two tracks\nwith the same session ID are on different threads if one can use deep\nbuffering and the other can\u0027t.\n\nIn this case, move effects attached to this session to the output\nthread ion which the new track is created.\n\nBug 6530324.\n\nChange-Id: I9019b3ee382e374c89d2319033afcfa7f886e4c4\n" }, { "commit": "55fddda7ae1cee9de86446e1842e072349de1bc4", "tree": "651eaf7763aacf47246530021068bdd03f2437b8", "parents": [ "6d80297a55ab12759ee00b7f99fa97584b430da0", "41ced0ade8a90f071e85fe1cf49f073c0738e95a" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 24 15:26:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 24 15:26:34 2012 -0700" }, "message": "am 41ced0ad: am 49fcd3cc: Fix an error caused by sample size value by order\n\n* commit \u002741ced0ade8a90f071e85fe1cf49f073c0738e95a\u0027:\n Fix an error caused by sample size value by order\n" }, { "commit": "41ced0ade8a90f071e85fe1cf49f073c0738e95a", "tree": "5de658f63af939b2c16e8b3eb7799d3223478b1b", "parents": [ "0cc6257030d3e6c649ea3ad807ecb9327ceb5b3e", "49fcd3cc0c0bf352c5c0516e53805278e94951ca" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 24 15:23:40 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 24 15:23:40 2012 -0700" }, "message": "am 49fcd3cc: Fix an error caused by sample size value by order\n\n* commit \u002749fcd3cc0c0bf352c5c0516e53805278e94951ca\u0027:\n Fix an error caused by sample size value by order\n" }, { "commit": "49fcd3cc0c0bf352c5c0516e53805278e94951ca", "tree": "9c6c223b2487999cb153ef02b44cef4e266c8c18", "parents": [ "f436fdcf93bd417fd3c9d2a8b19fd221d894b5e3" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 24 15:05:12 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 24 15:12:36 2012 -0700" }, "message": "Fix an error caused by sample size value by order\n\nThe sample size was saved in the array in network order, but it was treated as host order when\nwriteInt32() is called. Calling write(void *, int, int) resolves the issue.\n\nrelated-to-bug: 6555366\n\nChange-Id: If7ef99911ad65108c61b533673ac4d4cd580a370\n" }, { "commit": "aea2715e65994e665a3732551880419ba1cecc0d", "tree": "062b9c82f8d9ce4303467e46981c40d3b1fc1d8e", "parents": [ "e737cda649acbfa43fc1b74612a83f2fac9aa449" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu May 24 10:11:07 2012 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu May 24 12:12:43 2012 -0700" }, "message": "Prevent occurences of clipping in loud downmixed scenes\n\nThe downmixer effect is a mixer, wich, like the platform mixer,\n hard-clips. To prevent clipping during loud scenes across multiple\n chanels, apply a fixed attenuation on the result of the downmix.\n Note that this attenuation is lower the theoretical required\n attenuation (except for quad and surround) but is adequate for\n most content.\n\nBug 4280902\nChange-Id: Iec520e9f1367284d6102633f532429361717692d\n" }, { "commit": "6d80297a55ab12759ee00b7f99fa97584b430da0", "tree": "a936d42443306cc034a709e77397873fd2a0d611", "parents": [ "3545690e39ff7033c906d12d8bb77a06013d3f3c", "0cc6257030d3e6c649ea3ad807ecb9327ceb5b3e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 24 11:45:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 24 11:45:25 2012 -0700" }, "message": "am 0cc62570: am f436fdcf: audioflinger: change session check in createTrack.\n\n* commit \u00270cc6257030d3e6c649ea3ad807ecb9327ceb5b3e\u0027:\n audioflinger: change session check in createTrack.\n" }, { "commit": "0cc6257030d3e6c649ea3ad807ecb9327ceb5b3e", "tree": "935c7396b68a5b23c6ab893487658e9a605aee7f", "parents": [ "74ea96c7a7e9bf647c4201a060229e24a115c376", "f436fdcf93bd417fd3c9d2a8b19fd221d894b5e3" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 24 11:42:50 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 24 11:42:50 2012 -0700" }, "message": "am f436fdcf: audioflinger: change session check in createTrack.\n\n* commit \u0027f436fdcf93bd417fd3c9d2a8b19fd221d894b5e3\u0027:\n audioflinger: change session check in createTrack.\n" }, { "commit": "f436fdcf93bd417fd3c9d2a8b19fd221d894b5e3", "tree": "930951e6490510ef9eeab7210c8f729950783bd5", "parents": [ "e737cda649acbfa43fc1b74612a83f2fac9aa449" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 24 11:07:14 2012 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu May 24 11:07:14 2012 -0700" }, "message": "audioflinger: change session check in createTrack.\n\nDo not refuse to create a track on an output thread if the same session\nis present on another thread. It is now possible that two tracks\nwith the same session ID are on different threads if one can use deep\nbuffering and the other can\u0027t.\n\nIn this case, move effects attached to this session to the output\nthread ion which the new track is created.\n\nBug 6530324.\n\nChange-Id: I9019b3ee382e374c89d2319033afcfa7f886e4c4\n" }, { "commit": "3545690e39ff7033c906d12d8bb77a06013d3f3c", "tree": "b7dd2691138c6027933af8435d6c4a6ddbc3ce54", "parents": [ "329aa61818987fe079868bc22c0e237d578b184b", "852fca99e25db8d2180c2622ca55fca676490a08" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu May 24 10:56:29 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 24 10:56:29 2012 -0700" }, "message": "Merge \"Remove log spam for fast track denied\"" }, { "commit": "c2522525436414852d0d3f634765f452b00977e7", "tree": "7fe205574f185f130802571df572ad03361aba84", "parents": [ "461efc50b1a217ec8eac8b7f6786df29d53c0b37" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu May 24 10:34:25 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu May 24 10:34:25 2012 -0700" }, "message": "Revert \"Revert \"Revert to PV for AAC codec for FactoryROM.\"\"\n\nThis reverts commit c9ef89cd40bea216046ed28e5366f8ac361d3dd4.\n" }, { "commit": "461efc50b1a217ec8eac8b7f6786df29d53c0b37", "tree": "01ac3aaf0b68473c7e21c3056547b87a54f89f0f", "parents": [ "3587c3c77d924687608226271aeb3e70cb0731ff", "a97f9a2e731a45d9fb9be904161073aff523e483" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu May 24 10:16:54 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu May 24 10:16:54 2012 -0700" }, "message": "merge in nakasi-factoryrom-release history after reset to jb-dev\n" }, { "commit": "329aa61818987fe079868bc22c0e237d578b184b", "tree": "3bcc6337e925015ccfc5655b31e104b8b2a528a7", "parents": [ "4b9866e32b15e3512c8a6f84e2709ff542522991", "74ea96c7a7e9bf647c4201a060229e24a115c376" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu May 24 09:04:18 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 24 09:04:18 2012 -0700" }, "message": "am 74ea96c7: Reconcile with jb-release nakasi-factoryrom-release\n\n* commit \u002774ea96c7a7e9bf647c4201a060229e24a115c376\u0027:\n Revert \"Revert \"Revert to PV for AAC codec for FactoryROM.\"\"\n" }, { "commit": "74ea96c7a7e9bf647c4201a060229e24a115c376", "tree": "9d912dd61ecb20212ed0a6ad63a40baccdc05770", "parents": [ "4719fa8ae1259d6a94ba5b5ecdaa01e69f553996", "3587c3c77d924687608226271aeb3e70cb0731ff", "a97f9a2e731a45d9fb9be904161073aff523e483" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu May 24 09:01:13 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu May 24 09:01:13 2012 -0700" }, "message": "Reconcile with jb-release nakasi-factoryrom-release\n\nChange-Id: Id5f721d64bceada4e4d00fc49e0564af0497778d\n" }, { "commit": "852fca99e25db8d2180c2622ca55fca676490a08", "tree": "3f17c0f378e0d191d4ad961d3421ef6809a3f7e6", "parents": [ "a6d7da4e897d5201423f7c205d48c1c1a4a07e17" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu May 24 08:44:00 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu May 24 08:44:48 2012 -0700" }, "message": "Remove log spam for fast track denied\n\nBug: 6531054\nChange-Id: Iedf58e810a157aae88b5900da27c81054c437058\n" }, { "commit": "4b9866e32b15e3512c8a6f84e2709ff542522991", "tree": "3bcc6337e925015ccfc5655b31e104b8b2a528a7", "parents": [ "54b05aa7b48e77c95fe5e7f30fcd940b690c2119", "4719fa8ae1259d6a94ba5b5ecdaa01e69f553996" ], "author": { "name": "Bernhard Rosenkraenzer", "email": "Bernhard.Rosenkranzer@linaro.org", "time": "Thu May 24 06:58:57 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 24 06:58:57 2012 -0700" }, "message": "am 4719fa8a: libstagefright/matroska: Fix build with gcc 4.7\n\n* commit \u00274719fa8ae1259d6a94ba5b5ecdaa01e69f553996\u0027:\n libstagefright/matroska: Fix build with gcc 4.7\n" }, { "commit": "54b05aa7b48e77c95fe5e7f30fcd940b690c2119", "tree": "866e8396d8e303abaedc0630ad7d35718ebadb5b", "parents": [ "a6d7da4e897d5201423f7c205d48c1c1a4a07e17", "3c8889e827d95b195fe5ba077a01cb5b6042e534" ], "author": { "name": "Bernhard Rosenkraenzer", "email": "Bernhard.Rosenkranzer@linaro.org", "time": "Thu May 24 06:55:39 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 24 06:55:39 2012 -0700" }, "message": "am 3c8889e8: libmedia: Fix build with gcc 4.7\n\n* commit \u00273c8889e827d95b195fe5ba077a01cb5b6042e534\u0027:\n libmedia: Fix build with gcc 4.7\n" }, { "commit": "4719fa8ae1259d6a94ba5b5ecdaa01e69f553996", "tree": "9d912dd61ecb20212ed0a6ad63a40baccdc05770", "parents": [ "3c8889e827d95b195fe5ba077a01cb5b6042e534" ], "author": { "name": "Bernhard Rosenkraenzer", "email": "Bernhard.Rosenkranzer@linaro.org", "time": "Thu Mar 29 11:41:17 2012 +0200" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu May 24 06:54:14 2012 -0700" }, "message": "libstagefright/matroska: Fix build with gcc 4.7\n\ngcc 4.7 doesn\u0027t like the redefinition of i in the\nsame scope\n\nChange-Id: Idf1b33af7041f0302f2f2562442a3e11ce9607d9\nSigned-off-by: Bernhard Rosenkraenzer \u003cBernhard.Rosenkranzer@linaro.org\u003e\n" }, { "commit": "3c8889e827d95b195fe5ba077a01cb5b6042e534", "tree": "21f0fb2ccaa4a7643733d3f80e1443d62f44a447", "parents": [ "cba7b32d8f2c47632313f54118ed3733b4b02cc8" ], "author": { "name": "Bernhard Rosenkraenzer", "email": "Bernhard.Rosenkranzer@linaro.org", "time": "Thu Mar 29 11:38:59 2012 +0200" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu May 24 06:48:23 2012 -0700" }, "message": "libmedia: Fix build with gcc 4.7\n\ngcc 4.7 doesn\u0027t like the redefinition of n in the same\nscope:\nfor(size_t n\u003d...;;) {\n size_t n \u003d 2; // \u003c-- duplicate definition\n}\n\nChange-Id: Idfc2e768a0eb85a3dacccd3431b4ad44775432a4\nSigned-off-by: Bernhard Rosenkraenzer \u003cBernhard.Rosenkranzer@linaro.org\u003e\n" }, { "commit": "a6d7da4e897d5201423f7c205d48c1c1a4a07e17", "tree": "75433dc44c819fbb0e96276de9bd2bb0e9024374", "parents": [ "90886550eaf41e2255c99065667ac40b812b1c1b", "cba7b32d8f2c47632313f54118ed3733b4b02cc8" ], "author": { "name": "Kei Takahashi", "email": "KeiA.Takahashi@jp.sony.com", "time": "Wed May 23 14:49:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 23 14:49:35 2012 -0700" }, "message": "am cba7b32d: Add a new API on DRM Framework for streaming\n\n* commit \u0027cba7b32d8f2c47632313f54118ed3733b4b02cc8\u0027:\n Add a new API on DRM Framework for streaming\n" }, { "commit": "cba7b32d8f2c47632313f54118ed3733b4b02cc8", "tree": "b24101645accdc9067e7970ef22f3d934bda8edf", "parents": [ "cf0bf78c28cf25c30c42c784c1dc5bc094e6035d" ], "author": { "name": "Kei Takahashi", "email": "KeiA.Takahashi@jp.sony.com", "time": "Wed Jan 18 17:10:19 2012 +0900" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed May 23 14:44:06 2012 -0700" }, "message": "Add a new API on DRM Framework for streaming\n\nIn case of DRM streaming, decrypt session can start just after\nreceiving the header, and it doesn\u0027t need to wait for the entire\ncontent. However, current API of DRM framework only accepts file\nhandle or URI. With this new API, DRM session can start\nwithout waiting for the entire content.\n\nChanges are made by SEMC and Sony.\n\nChange-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c\n" }, { "commit": "3587c3c77d924687608226271aeb3e70cb0731ff", "tree": "01ac3aaf0b68473c7e21c3056547b87a54f89f0f", "parents": [ "e737cda649acbfa43fc1b74612a83f2fac9aa449", "3174ac1ba34f26d6f14812e22905007bde96cce9" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed May 23 07:01:41 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed May 23 07:01:41 2012 -0700" }, "message": "merge in jb-release history after reset to jb-dev\n" }, { "commit": "90886550eaf41e2255c99065667ac40b812b1c1b", "tree": "6c4a9b7f9c3529b84650da5ef20597e1d3942fd7", "parents": [ "4417ec0bed2575853b3ef904b105e954e3e5756d", "cf0bf78c28cf25c30c42c784c1dc5bc094e6035d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue May 22 21:15:46 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 22 21:15:46 2012 -0700" }, "message": "am cf0bf78c: am e737cda6: audioflinger: refine latency latency calculation.\n\n* commit \u0027cf0bf78c28cf25c30c42c784c1dc5bc094e6035d\u0027:\n audioflinger: refine latency latency calculation.\n" }, { "commit": "cf0bf78c28cf25c30c42c784c1dc5bc094e6035d", "tree": "8dbf194077b7aacd996636352ff0cc9006059905", "parents": [ "73e9a35c41efe4dac6b05387a9dafecdc662f140", "e737cda649acbfa43fc1b74612a83f2fac9aa449" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue May 22 21:13:29 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 22 21:13:29 2012 -0700" }, "message": "am e737cda6: audioflinger: refine latency latency calculation.\n\n* commit \u0027e737cda649acbfa43fc1b74612a83f2fac9aa449\u0027:\n audioflinger: refine latency latency calculation.\n" }, { "commit": "e737cda649acbfa43fc1b74612a83f2fac9aa449", "tree": "01ac3aaf0b68473c7e21c3056547b87a54f89f0f", "parents": [ "8d9846c0693b7651b243f0161caa86be506f764a" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue May 22 18:55:44 2012 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue May 22 19:06:51 2012 -0700" }, "message": "audioflinger: refine latency latency calculation.\n\nThere is an audio pipe between the normal mixer output and the fast\nmixer to cope for scheduling delays and buffer size difference.\nThis pipe depth was not taken into account in latency calculation.\n\nAdding the pipe contribution to the latency significantly improves A/V sync.\n\nBug 6520569.\n\nChange-Id: I5584908e8aa8a02170eb38b22b4370eea800a235\n" }, { "commit": "4417ec0bed2575853b3ef904b105e954e3e5756d", "tree": "9048df91116828cc24e0796bc84bb3bfb99984c6", "parents": [ "56b6f9c33a8318db543a59b7da34fec0d50f8c44", "73e9a35c41efe4dac6b05387a9dafecdc662f140" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 22 14:22:01 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 22 14:22:01 2012 -0700" }, "message": "am 73e9a35c: am 8d9846c0: Merge \"Tell surface flinger that we want to protect output buffers from being\" into jb-dev\n\n* commit \u002773e9a35c41efe4dac6b05387a9dafecdc662f140\u0027:\n Tell surface flinger that we want to protect output buffers from being\n" }, { "commit": "56b6f9c33a8318db543a59b7da34fec0d50f8c44", "tree": "c3e1fe65af31865c0c9fdde3cc693f7276c546ef", "parents": [ "ea1151ac33f9327a44a6c7b80c1c15586c0f380c", "a508b3d74454664e209e315ba9296b53cf50c13d" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue May 22 14:21:10 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 22 14:21:10 2012 -0700" }, "message": "am a508b3d7: Reconcile with jb-release\n\n* commit \u0027a508b3d74454664e209e315ba9296b53cf50c13d\u0027:\n" }, { "commit": "ea1151ac33f9327a44a6c7b80c1c15586c0f380c", "tree": "c3e1fe65af31865c0c9fdde3cc693f7276c546ef", "parents": [ "5f325ffb086e86f7f3ef5ff84db2ba156d6514af", "25a25ebdd1cca5fa42ef20d4d55c3e49da294380" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue May 22 14:20:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 22 14:20:38 2012 -0700" }, "message": "am 25a25ebd: am 67e54402: Merge \"Keep a copy of most recent audio played\" into jb-dev\n\n* commit \u002725a25ebdd1cca5fa42ef20d4d55c3e49da294380\u0027:\n Keep a copy of most recent audio played\n" }, { "commit": "a97f9a2e731a45d9fb9be904161073aff523e483", "tree": "f76d81e053458796fbabcb6d526a97b6e1cba380", "parents": [ "97e0cd6fd56f8fe0faea1620fb90ed252bfec805" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue May 22 13:56:51 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue May 22 13:56:51 2012 -0700" }, "message": "Revert \"Revert \"Revert to PV for AAC codec for FactoryROM.\"\"\n\nThis reverts commit c9ef89cd40bea216046ed28e5366f8ac361d3dd4.\n" }, { "commit": "73e9a35c41efe4dac6b05387a9dafecdc662f140", "tree": "2e577cb2efa2f453ea7982de1418e1f6779de5dc", "parents": [ "a508b3d74454664e209e315ba9296b53cf50c13d", "8d9846c0693b7651b243f0161caa86be506f764a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 22 13:50:55 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 22 13:50:55 2012 -0700" }, "message": "am 8d9846c0: Merge \"Tell surface flinger that we want to protect output buffers from being\" into jb-dev\n\n* commit \u00278d9846c0693b7651b243f0161caa86be506f764a\u0027:\n Tell surface flinger that we want to protect output buffers from being\n" }, { "commit": "8d9846c0693b7651b243f0161caa86be506f764a", "tree": "75cc829b00829096de7ad60d291a90144104ee86", "parents": [ "67e5440202cc442621c352756537ead31fca80cf", "bc098410be55f9d96f394b3981a0c482b83859b6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 22 13:48:59 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 22 13:48:59 2012 -0700" }, "message": "Merge \"Tell surface flinger that we want to protect output buffers from being\" into jb-dev" }, { "commit": "97e0cd6fd56f8fe0faea1620fb90ed252bfec805", "tree": "581379729389cbea7652272117fd9dc81feff1f8", "parents": [ "2fedd5ae24a781d6da3ac50a84d8831c0295882a", "aa2eb417ffa7b00fc316cdf2d8c24cb094ef7048" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue May 22 13:23:06 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue May 22 13:23:06 2012 -0700" }, "message": "merge in nakasi-factoryrom-release history after reset to jb-dev\n" }, { "commit": "a508b3d74454664e209e315ba9296b53cf50c13d", "tree": "6203c03856eb2da67e0ce15be76ba3e4d7e7913f", "parents": [ "25a25ebdd1cca5fa42ef20d4d55c3e49da294380", "3174ac1ba34f26d6f14812e22905007bde96cce9" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue May 22 13:05:11 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue May 22 13:05:11 2012 -0700" }, "message": "Reconcile with jb-release\n\nChange-Id: I1f173833b337368c87084eccddb4d9b7d46294fd\n" }, { "commit": "bc098410be55f9d96f394b3981a0c482b83859b6", "tree": "45681d846f6862d558b04be1a4b36bb4a2b4c54f", "parents": [ "a6490c65f93e1cbe969fba499978e8d64214108a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 22 12:55:03 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue May 22 12:55:03 2012 -0700" }, "message": "Tell surface flinger that we want to protect output buffers from being\n\nsent to HDMI (without HDCP) and push a few black frames on IDLE-\u003eLOADED\nsimilar to OMXCodec\u0027s behaviour.\n\nChange-Id: Iea6055a115151ca881220a70a31af6ade2c58cb3\nrelated-to-bug: 6537187\n" }, { "commit": "25a25ebdd1cca5fa42ef20d4d55c3e49da294380", "tree": "6203c03856eb2da67e0ce15be76ba3e4d7e7913f", "parents": [ "bbc0940562f8cb6cbf19750246eb259b43a5a698", "67e5440202cc442621c352756537ead31fca80cf" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue May 22 12:15:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 22 12:15:35 2012 -0700" }, "message": "am 67e54402: Merge \"Keep a copy of most recent audio played\" into jb-dev\n\n* commit \u002767e5440202cc442621c352756537ead31fca80cf\u0027:\n Keep a copy of most recent audio played\n" }, { "commit": "67e5440202cc442621c352756537ead31fca80cf", "tree": "89d2d2abadb4f5cf3fa055cfe07e90db730fae0d", "parents": [ "a6490c65f93e1cbe969fba499978e8d64214108a", "fbae5dae5187aca9d974cbe15ec818e9c6f56705" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue May 22 12:13:58 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 22 12:13:58 2012 -0700" }, "message": "Merge \"Keep a copy of most recent audio played\" into jb-dev" } ], "next": "5f325ffb086e86f7f3ef5ff84db2ba156d6514af" }