aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Increase patchParam array size by one and fix ↵Fraunhofer IIS FDK2023-06-050-0/+0
|\ | | | | | | | | | | | | | | | | | | | | out-of-bounce write in resetLppTransposer(). am: cd6f219861 -s ours am: 14db3e3104 -s ours am: 882e4f2180 -s ours am: d72330c0a7 -s ours am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 2f8c08a4e7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497642 Change-Id: Icbc5a0198c63b8cdd837c65c3702d2b635c51561 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * [automerger skipped] Increase patchParam array size by one and fix ↵Fraunhofer IIS FDK2023-06-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out-of-bounce write in resetLppTransposer(). am: cd6f219861 -s ours am: 14db3e3104 -s ours am: 882e4f2180 -s ours am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 2f8c08a4e7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497642 Change-Id: I71bc71785f1bbe9492afcea56692f11eec04e15b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * [automerger skipped] Increase patchParam array size by one and fix ↵Fraunhofer IIS FDK2023-06-050-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out-of-bounce write in resetLppTransposer(). am: cd6f219861 -s ours am: 14db3e3104 -s ours am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 2f8c08a4e7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497642 Change-Id: I61a8a0b62b9d5a14ba86fee7c1897b049504392c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * [automerger skipped] Increase patchParam array size by one and fix ↵Fraunhofer IIS FDK2023-06-050-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out-of-bounce write in resetLppTransposer(). am: cd6f219861 -s ours am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 2f8c08a4e7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497642 Change-Id: If658ec94a0c6db63a0818039d89f556178c71aa9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * Increase patchParam array size by one and fix out-of-bounce write in ↵Fraunhofer IIS FDK2023-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resetLppTransposer(). Bug: 279766766 Test: see POC Change-Id: I206973e0bb21140865efffd930e39f920f477359 Merged-In: I206973e0bb21140865efffd930e39f920f477359 (cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
* | | | | [automerger skipped] Increase patchParam array size by one and fix ↵Fraunhofer IIS FDK2023-06-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out-of-bounce write in resetLppTransposer(). am: 2f8c08a4e7 am: d71bdb8fa4 -s ours am: c933b13d82 -s ours am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cf141c714f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497643 Change-Id: Icc556560125c6309444b7c3ab164932bb7ad8243 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | [automerger skipped] Increase patchParam array size by one and fix ↵Fraunhofer IIS FDK2023-06-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out-of-bounce write in resetLppTransposer(). am: 2f8c08a4e7 am: d71bdb8fa4 -s ours am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cf141c714f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497643 Change-Id: I327326f0f1a25b5e950531bc2f48a5226efbe6cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | Increase patchParam array size by one and fix out-of-bounce write in ↵Fraunhofer IIS FDK2023-06-051-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resetLppTransposer(). am: 2f8c08a4e7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497643 Change-Id: I968eb9733f397cb354adf68b536436b44102eeb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | Increase patchParam array size by one and fix out-of-bounce write in ↵Fraunhofer IIS FDK2023-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resetLppTransposer(). Bug: 279766766 Test: see POC Change-Id: I206973e0bb21140865efffd930e39f920f477359 Merged-In: I206973e0bb21140865efffd930e39f920f477359 (cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
* | | | | Increase patchParam array size by one and fix out-of-bounce write in ↵Fraunhofer IIS FDK2023-06-051-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resetLppTransposer(). am: cf141c714f Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497644 Change-Id: Ieb9f45ff464225c80a170c296dc17058e6f56e89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Increase patchParam array size by one and fix out-of-bounce write in ↵Fraunhofer IIS FDK2023-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resetLppTransposer(). Bug: 279766766 Test: see POC Change-Id: I206973e0bb21140865efffd930e39f920f477359 Merged-In: I206973e0bb21140865efffd930e39f920f477359 (cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
* | | | | Merge "Disable MPEG-D DRC for legacy AOTs" am: aa9650bdc4 am: b3318ce691Treehugger Robot2023-05-012-40/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562630 Change-Id: I06f7f454988a27cf05c329b85d7bc668eb5673d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * \ \ \ \ Merge "Disable MPEG-D DRC for legacy AOTs" am: aa9650bdc4Treehugger Robot2023-05-012-40/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562630 Change-Id: I68a2aba4720b5615111e1fd07a334e43ae6d5718 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * \ \ \ \ Merge "Disable MPEG-D DRC for legacy AOTs"Treehugger Robot2023-05-012-40/+3
| | |\ \ \ \ \
| | | * | | | | Disable MPEG-D DRC for legacy AOTsJean-Michel Trivi2023-04-252-40/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable MPEG-D DRC metadata for legacy AOTs 2 (AAC-LC), 5 (HE-AAC), and 29 (HE-AAC v2). Bug: 241391733 Test: see bug (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2f4c595c4abd721967ecb494f5aec3f6b6dafb9e) Merged-In: Ie84badaa24bb4169adfdb1d3243525c32b44d3e9 Change-Id: Ie84badaa24bb4169adfdb1d3243525c32b44d3e9
* | | | | | | | Merge "Remove obsolete uni drc precedence handling" am: 7f83eb07af am: ↵Treehugger Robot2023-05-015-48/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc087c5c90 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562610 Change-Id: Ib91dbddb88fcab7c2e3d8128fedc13b84ec2e510 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | Merge "Remove obsolete uni drc precedence handling" am: 7f83eb07afTreehugger Robot2023-05-015-48/+11
|/| | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562610 Change-Id: I8d29d1b5b13251bd3f375da79156dfeead7104d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | Merge "Remove obsolete uni drc precedence handling"Treehugger Robot2023-05-015-48/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove obsolete uni drc precedence handlingJean-Michel Trivi2023-04-255-48/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 241391733 Test: see bug (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c41b05b6c60275c2a6b28918f40c218a8b818f6) Merged-In: I0ddc479626fb6a89d04bc989256ad1d8ec4275a3 Change-Id: I0ddc479626fb6a89d04bc989256ad1d8ec4275a3
* | | | | | Merge "Correct comment spelling error." am: 0f065e796b am: 18cb3fccf6Jean-Michel Trivi2023-04-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2519657 Change-Id: I9219ef758ffb43804959a70204dce05de88447ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | Merge "Correct comment spelling error." am: 0f065e796bJean-Michel Trivi2023-04-041-1/+1
|/| | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2519657 Change-Id: Ifeddd337fb8c4b648aaafb8c86c94ea4fa904f76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | Merge "Correct comment spelling error."Jean-Michel Trivi2023-04-041-1/+1
|/| | | | |
| * | | | | Correct comment spelling error.wujianxing12023-04-031-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I2b0451986e70d0fbb7fefa5bbb95b1ca98e4f7ac Signed-off-by: wujianxing1 <wujianxing1@xiaomi.corp-partner.google.com>
* | | | | Merge "Add riscv64 support" am: 75e9f62078 am: 87b22603e8Treehugger Robot2022-11-041-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2171525 Change-Id: If1c06433eb568c9823c89d86ba6686ac4ac7366d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | Merge "Add riscv64 support" am: 75e9f62078Treehugger Robot2022-11-041-0/+7
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2171525 Change-Id: I4d5851ffc1e5e1892ec83209045ccf3bf4b188cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | Merge "Add riscv64 support"Treehugger Robot2022-11-041-0/+7
| |\ \ \ \ \
| | * | | | | Add riscv64 supporthaocheng.zy2022-08-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Zhang Ye <haocheng.zy@linux.alibaba.com> Signed-off-by: Mao Han <han_mao@linux.alibaba.com> Change-Id: Ifc1c8801d885b0b4ac1bf91842830ab650780328
* | | | | | | Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: ↵Treehugger Robot2022-08-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b918d8de0 am: 34effe2f68 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087 Change-Id: I90093847a2efe1b5af80f14712353a3531e1c9c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * \ \ \ \ \ \ Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: ↵Treehugger Robot2022-08-231-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b918d8de0 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087 Change-Id: Ic2dda304ecfb4d8c520c30ffd95b704497260d03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * \ \ \ \ \ \ Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07bTreehugger Robot2022-08-231-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087 Change-Id: I20beda4ed1fcf0a060e0ca03d6e76a161d499aeb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | Merge "[Bluetooth apex] Use new apex name" am: f9820781d9Treehugger Robot2022-08-231-1/+1
| | |/| | | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087 Change-Id: Iaea278a4c8c276598c1d9d7b6a6495a2faad0591 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | Merge "[Bluetooth apex] Use new apex name"Treehugger Robot2022-08-231-1/+1
| | |/| | | | | |
| | | * | | | | | [Bluetooth apex] Use new apex nameWilliam Escande2022-08-221-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Bluetooth apex name is now called com.android.btservices Bug: 243054261 Test: Build Change-Id: I504a8727ddf73d3568616bc0f57983331dd28744
* | | | | | | | Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 ↵Treehugger Robot2022-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8da1061f74 am: 2c2abe9736 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: I8ef7094e0c67b956b2c7302a247b26323cdd9879 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 ↵Treehugger Robot2022-06-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8da1061f74 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: I4018d2e225aefd674fddc8691cfeb0c9d2a3ac8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6Treehugger Robot2022-06-170-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: I17ca4d9dc314d0b286708b079cdb9464be99e942 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62Treehugger Robot2022-06-170-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: If09f84637bfd45a2ded9516104de2e7ae520d402 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | Merge "DO NOT MERGE - Skip SQ3A.220605.009"Treehugger Robot2022-06-170-0/+0
| | | | |\ \ \ \ \
* | | | | | | | | | DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: ↵Xin Li2022-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94a09cf355 am: a5b4e7363f Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: Ib7c8008cf259618654de2d4a9c23fc26310741ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | | | DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: 94a09cf355Xin Li2022-06-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: Ia1f3936ec9a751e6bc8e9b31e5130976b0bd2276 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | | | DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2Xin Li2022-06-170-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: I5e56b7dd29b51efb2fb330832f7b990d5f735408 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5Xin Li2022-06-170-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: I5cf15e7b63c5874ada7ec110523d5f1e2bb83157 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | DO NOT MERGE - Skip SQ3A.220605.009Xin Li2022-06-160-0/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 236045730 Merged-In: I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 Change-Id: Ie0ca07f0aa6ea25a02e3702745c1ab1b6fd55bc9
| | | | | * | | | | Snap for 8417597 from f02e2ba58f6c161ea1792ed180242ba7d6b849e0 to ↵Android Build Coastguard Worker2022-04-071-1/+7
| | | | | |\ \ \ \ \ | | | | | | | |_|_|/ | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sc-qpr3-release Change-Id: Iede59048bfac7adc5daa9359fed3c2295873637c
* | | | | | | | | | [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours ↵Xin Li2022-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5ccfd6ac78 -s ours am: 1a013376bd -s ours am: 2e02d4c91c -s ours am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004 Change-Id: I32589f68cdaf3ae48930b21947e79d615b4d41b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | | | [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours ↵Xin Li2022-06-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5ccfd6ac78 -s ours am: 1a013376bd -s ours am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004 Change-Id: I42c52aac9bcff66d7dbeb5da3964bc1039827306 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | | | [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours ↵Xin Li2022-06-170-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5ccfd6ac78 -s ours am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004 Change-Id: Ic35150ce86342d8abe9bfc0f77c0b255c3ec7d42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s oursXin Li2022-06-160-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004 Change-Id: I7881f686f3011850e299efde8c2588f5d7ceaff6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | Merge "Merge Android 12 QPR 3"Xin Li2022-06-161-1/+7
| | | | |\ \ \ \ \ \
* | | | | | | | | | | [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: ↵Xin Li2022-06-170-0/+0
|\| | | | | | | | | | | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c9fe29541 -s ours am: 3d2637ce9a -s ours am: 9eb437d8ca -s ours am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004 Change-Id: Ife4349f0a7ab64120e0bb4fba0c6e1b72465ad49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-12 01:03:13 +0000