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: Iaa75cfac4934f2bdab6cfddec6b0c34edab68752 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: I4bb7d619e3b535d3c74988470f4075478b6b70ea 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 am: f1b90b8dff -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/+/23497644 Change-Id: Ieb5da4c6c143b821aa54f5374157c225dd4c8b5c 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: 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>
* | \ \ \ \ \ [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: I4a527301ff179b638f51567562ad1a40995557ed 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: I84543f1357f7dde3ff81f912c9ee76a9560410cc 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] Merge "Disable MPEG-D DRC for legacy AOTs" am: ↵Treehugger Robot2023-05-010-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa9650bdc4 am: b3318ce691 am: f0f384d363 -s ours am skip reason: Merged-In Ie84badaa24bb4169adfdb1d3243525c32b44d3e9 with SHA-1 2f4c595c4a is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562630 Change-Id: Ia3e3f1c4772a1ee64c99fae0b0318f176c108d3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | 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
* | | | | | | | | | [automerger skipped] Merge "Remove obsolete uni drc precedence handling" am: ↵Treehugger Robot2023-05-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f83eb07af am: dc087c5c90 am: bc912c4780 -s ours am skip reason: Merged-In I0ddc479626fb6a89d04bc989256ad1d8ec4275a3 with SHA-1 4c41b05b6c is already in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562610 Change-Id: I3b05500a54a5cd9db8aafbb1ec09c4ae2cef932a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | | | | | 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
* | | | | | | | 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: I1918a1e75e006ab291625065bba8943237777f93 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: Icfb2b46c74449cd0ed4b1aa4721fbcf7d4a27c10 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 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 02:23:26 +0000