aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | | | | | | | | | | | | 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>
| | * | | | | | | | | | | | | | 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
| | | | | | | * | | | | | | | | | | 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: 85b17c8c10 -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: Idfdf539fd4874772c3bef65519ddaec869361b37 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: 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: f7594a4c73 -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: If0480b81892c6f79f4a6c3cd58f523d6ae82d127 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | | | | | | | | | | | | [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>
| | | * | | | | | | | | | | | | | | [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 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: Ie7f7e1b880623ccf0377038c48ad0bec25ebf7fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | | | | | | | | [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: ↵Xin Li2022-06-170-0/+0
| | | | |\| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c9fe29541 -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: I9f4e52edb80ba867982c657f12f79b2fe2a17e3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | * | | | | | | | | | | [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -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: If8b5a0cf1530fd8f49ceda4fd767bf4f67827e1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * | | | | | | | | | Merge Android 12 QPR 3Xin Li2022-06-141-1/+7
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| / / / / / / / / / | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 236045730 Merged-In: I4df938df7886adc58185586190e27bcd16e17966 Change-Id: I14c070faf59e63c6fac783faf8f8f5ec41609c29
| | | | | | | | | * | | | | | [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: ↵Xin Li2022-04-200-0/+0
| | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours am: 09023836cb -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627 Change-Id: I8bd2fd5d97bc02766b1eb9182ab12b0763017343 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | | | | | * | | | | [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: ↵Xin Li2022-04-200-0/+0
| | | | | | | | | | |\ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627 Change-Id: I42922a84bff598191dd22fa9dad1fc7022a2f2a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | | | | * | | | | | [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: ↵Xin Li2022-04-200-0/+0
| | | | | | | | | |\ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours am: 7e1fb037c7 -s ours am: 2c16a17358 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627 Change-Id: Ia644755696ea531375453e840f4c605e85b80246 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | | | | | | | | [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: ↵Xin Li2022-04-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours am: 7e1fb037c7 -s ours am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627 Change-Id: I9eb7a01dbe13825311174b700169cd7b8387fc4b 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 2024-12-28 03:42:19 +0000