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: 24ff1ff2b2 -s ours am: e4342fee79 -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: Ib75661e72116025bcc99582c107f6c587e71934c 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: 24ff1ff2b2 -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: If3095b66732503a47967798c3bad4c5a20f6f11d 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: Icf0b65e3a9bc2ee93deb85823aff6b6f773169d9 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: 7eff67a079 -s ours am: edefec42ea -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: I1d148b68990070491a4c8cd670b72205639762f2 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: 7eff67a079 -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: If72c52599c88f034912524abac6a1cae4f0f7e90 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: I7b204263b83a23c81138a697905553c28fce4dae 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: cf141c714f -s ours am: 25f9b3a489 -s ours am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 0c4954dd87 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497644 Change-Id: If21fcba97c5a0e8aec5eecc5817cef28adc223b9 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: cf141c714f -s ours am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 0c4954dd87 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497644 Change-Id: I25ec900e95aa401d61b6685a5355d81d2693f561 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: 0c4954dd87 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497047 Change-Id: I7154fff0e154bf81759817611176fa3663a84d31 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)
* | | | | | Remove obsolete uni drc precedence handling am: 4c41b05b6cFraunhofer IIS FDK2023-04-255-48/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/22789795 Change-Id: Ic1e0182955acdc0b877add5a0f2805557e2b9414 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | Remove obsolete uni drc precedence handlingFraunhofer IIS FDK2023-04-215-48/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 241391733 Test: see bug Change-Id: I0ddc479626fb6a89d04bc989256ad1d8ec4275a3
* | | | | | Disable MPEG-D DRC for legacy AOTs am: 2f4c595c4aJean-Michel Trivi2023-04-252-40/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/22789794 Change-Id: I935fb3279dcc04adb04baccf5fcac0563b8d6405 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | Disable MPEG-D DRC for legacy AOTsJean-Michel Trivi2023-04-212-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 Change-Id: Ie84badaa24bb4169adfdb1d3243525c32b44d3e9
* | | | | | Merge "Correct comment spelling error." am: 0f065e796b am: 18cb3fccf6 am: ↵Jean-Michel Trivi2023-04-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6afc4ee44 am: 9a1d7af5d5 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2519657 Change-Id: I19075c375deb5ed8cb527ce58c86f6f3d08fb787 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | Merge "Correct comment spelling error." am: 0f065e796b am: 18cb3fccf6 am: ↵Jean-Michel Trivi2023-04-041-1/+1
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6afc4ee44 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2519657 Change-Id: I0ccbc0c4671d836dd385a6b82b85bef7f974248f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | 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>
* | | | | | Update the version numbers in the public installed headersMartin Storsjo2022-12-092-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 261048742 Test: atest android.media.encoder.cts.EncoderTest Change-Id: I44537c067e6ef34e77a67d02d8e9a8e9dfffab92
* | | | | | Include the encoder library version in the publicly installed headerMartin Storsjo2022-12-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows callers to conditionally use new API features without breaking compatibility with the earlier versions of the library. Bug: 261048742 Test: atest android.media.encoder.cts.EncoderTest Change-Id: Icdf18317e120caf8be750a839ae75a6ac8eba142
* | | | | | Merge "Add riscv64 support" am: 75e9f62078 am: 87b22603e8 am: a30d828f33Treehugger Robot2022-11-041-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2171525 Change-Id: I0d4764f69e5075df012ee7ad7c059881dcff69d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.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 am: 6097888451 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2192087 Change-Id: Ib205b865950336bf275640c891fd111ca8c1e22d 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-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
* | | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: ↵Treehugger Robot2022-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2231acfd62 am: 8f53fdaaa6 am: 8da1061f74 am: 2c2abe9736 am: 9cf12aa868 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: Ia697176fcde810faa01a30e669cd17cd7a921dce 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 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
| | | | | |\ \ \ \ \
* | | | | | | | | | | [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: ↵Xin Li2022-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 181d0ef5e2 am: 94a09cf355 am: a5b4e7363f am: 580e9caedd -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2128078 Change-Id: Ieb7e5a23c273f1c4419316fb4ea9f0e5e8246b8c 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: ↵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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 13:20:01 +0000