fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-18 04:00:36 +01:00
Code Issues Projects Releases Wiki Activity
1,818 Commits 10 Branches 11 Tags
Commit Graph

1818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fraunhofer IIS FDK
1052e4c46c [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 173576b2b3 -s ours am: 2297b69943 -s ours am: daa7312ce2 -s ours am: 8fa3cb2888 -s ours am: 8e7379d938 -s ours 
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 35a37fd6ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497466

Change-Id: I3cbf2ad394c785e15c7ff794e4a92de998bdac1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:04:55 +00:00
Fraunhofer IIS FDK
ca237e7dbe [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 35a37fd6ed -s ours am: ae3186940a -s ours am: 7c0b490f6b -s ours am: cc453a7a26 -s ours 
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640

Change-Id: I19533b5c7716fd251c36c104cf97e948d73735d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:04:50 +00:00
Fraunhofer IIS FDK
8e7379d938 [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 173576b2b3 -s ours am: 2297b69943 -s ours am: daa7312ce2 -s ours am: 8fa3cb2888 -s ours 
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 35a37fd6ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497466

Change-Id: Iacb88b5be83b7303d6c715fb67e7a28e07b03fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:39:22 +00:00
Fraunhofer IIS FDK
cc453a7a26 [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 35a37fd6ed -s ours am: ae3186940a -s ours am: 7c0b490f6b -s ours 
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640

Change-Id: I1d04af405cd3781d11ed41f96755784e3b73524e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:39:17 +00:00
Fraunhofer IIS FDK
e4342fee79 [automerger skipped] Increase patchParam array size by one and fix 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>
 2023-06-05 18:36:46 +00:00
Fraunhofer IIS FDK
edefec42ea [automerger skipped] Increase patchParam array size by one and fix 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>
 2023-06-05 18:36:31 +00:00
Fraunhofer IIS FDK
8fa3cb2888 [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 173576b2b3 -s ours am: 2297b69943 -s ours am: daa7312ce2 -s ours 
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 35a37fd6ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497466

Change-Id: I0e3d78d5f007d1e799048082a968084d36f40809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:12:10 +00:00
Fraunhofer IIS FDK
7c0b490f6b [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 35a37fd6ed -s ours am: ae3186940a -s ours 
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640

Change-Id: I5b07f584bc4c2d8a241981b70cc891f2c8b61fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:12:04 +00:00
Fraunhofer IIS FDK
daa7312ce2 [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 173576b2b3 -s ours am: 2297b69943 -s ours 
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 35a37fd6ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497466

Change-Id: I7e6148792e5cfb13f1f000e1e4bac858c1af5e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 17:55:27 +00:00
Fraunhofer IIS FDK
ae3186940a [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 35a37fd6ed -s ours 
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640

Change-Id: Ie7a8385adde4f07fb5e7e7d1e7fc586c7d730d67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 17:55:22 +00:00
Fraunhofer IIS FDK
24ff1ff2b2 [automerger skipped] Increase patchParam array size by one and fix 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>
 2023-06-05 17:54:47 +00:00
Fraunhofer IIS FDK
7eff67a079 Increase patchParam array size by one and fix out-of-bounce write in 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>
 2023-06-05 17:54:41 +00:00
Fraunhofer IIS FDK
2297b69943 [automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 173576b2b3 -s ours 
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 35a37fd6ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497466

Change-Id: Ied5877b110fc7361eed78db35b4679edefcabfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 17:52:08 +00:00
Fraunhofer IIS FDK
25f9b3a489 [automerger skipped] Increase patchParam array size by one and fix 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>
 2023-06-05 17:51:42 +00:00
Fraunhofer IIS FDK
14db3e3104 [automerger skipped] Increase patchParam array size by one and fix 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>
 2023-06-05 17:49:43 +00:00
Fraunhofer IIS FDK
cf141c714f Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). 
Bug: 279766766
Test: see POC
Change-Id: I206973e0bb21140865efffd930e39f920f477359
Merged-In: I206973e0bb21140865efffd930e39f920f477359
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
 2023-05-31 19:05:30 +00:00
Fraunhofer IIS FDK
2f8c08a4e7 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). 
Bug: 279766766
Test: see POC
Change-Id: I206973e0bb21140865efffd930e39f920f477359
Merged-In: I206973e0bb21140865efffd930e39f920f477359
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
 2023-05-31 19:04:44 +00:00
Fraunhofer IIS FDK
cd6f219861 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). 
Bug: 279766766
Test: see POC
Change-Id: I206973e0bb21140865efffd930e39f920f477359
Merged-In: I206973e0bb21140865efffd930e39f920f477359
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
 2023-05-31 19:03:52 +00:00
Fraunhofer IIS FDK
35a37fd6ed Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). 
Bug: 279766766
Test: see POC
Change-Id: I206973e0bb21140865efffd930e39f920f477359
Merged-In: I206973e0bb21140865efffd930e39f920f477359
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
 2023-05-31 19:03:22 +00:00
Fraunhofer IIS FDK
173576b2b3 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). 
Bug: 279766766
Test: see POC
Change-Id: I206973e0bb21140865efffd930e39f920f477359
Merged-In: I206973e0bb21140865efffd930e39f920f477359
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
 2023-05-31 19:02:06 +00:00
Fraunhofer IIS FDK
0c4954dd87 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). 
Bug: 279766766
Test: see POC
Change-Id: I206973e0bb21140865efffd930e39f920f477359
Merged-In: I206973e0bb21140865efffd930e39f920f477359
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
 2023-05-31 18:56:49 +00:00
Fraunhofer IIS FDK
4c41b05b6c Remove obsolete uni drc precedence handling 
Bug: 241391733
Test: see bug
Change-Id: I0ddc479626fb6a89d04bc989256ad1d8ec4275a3
 2023-04-21 18:23:24 -07:00
Jean-Michel Trivi
2f4c595c4a Disable MPEG-D DRC for legacy AOTs 
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
 2023-04-21 17:14:34 -07:00
Jean-Michel Trivi
9a1d7af5d5 Merge "Correct comment spelling error." am: 0f065e796b am: 18cb3fccf6 am: 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>
 2023-04-04 21:37:40 +00:00
Jean-Michel Trivi
a6afc4ee44 Merge "Correct comment spelling error." am: 0f065e796b am: 18cb3fccf6 
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>
 2023-04-04 21:07:12 +00:00
Jean-Michel Trivi
18cb3fccf6 Merge "Correct comment spelling error." am: 0f065e796b 
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>
 2023-04-04 20:24:48 +00:00
Jean-Michel Trivi
0f065e796b Merge "Correct comment spelling error." 2023-04-04 19:59:06 +00:00
wujianxing1
477ac94c2d Correct comment spelling error. 
Change-Id: I2b0451986e70d0fbb7fefa5bbb95b1ca98e4f7ac
Signed-off-by: wujianxing1 <wujianxing1@xiaomi.corp-partner.google.com>
 2023-04-03 17:06:00 +08:00
Martin Storsjo
7cb7d8c181 Update the version numbers in the public installed headers 
Bug: 261048742
Test: atest android.media.encoder.cts.EncoderTest
Change-Id: I44537c067e6ef34e77a67d02d8e9a8e9dfffab92
 2022-12-09 04:19:16 +00:00
Martin Storsjo
32c697660d Include the encoder library version in the publicly installed header 
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
 2022-12-01 21:48:47 +00:00
Treehugger Robot
2032bc891f Merge "Add riscv64 support" am: 75e9f62078 am: 87b22603e8 am: a30d828f33 
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>
 2022-11-04 23:46:45 +00:00
Treehugger Robot
a30d828f33 Merge "Add riscv64 support" am: 75e9f62078 am: 87b22603e8 
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>
 2022-11-04 23:13:55 +00:00
Treehugger Robot
87b22603e8 Merge "Add riscv64 support" am: 75e9f62078 
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>
 2022-11-04 22:29:53 +00:00
Treehugger Robot
75e9f62078 Merge "Add riscv64 support" 2022-11-04 21:52:02 +00:00
Treehugger Robot
433a135d67 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: 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>
 2022-08-24 01:14:36 +00:00
Treehugger Robot
6097888451 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: 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>
 2022-08-24 00:28:39 +00:00
Treehugger Robot
34effe2f68 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b am: 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>
 2022-08-23 23:33:49 +00:00
Treehugger Robot
1b918d8de0 Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 am: 82c5dbb07b 
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>
 2022-08-23 23:03:06 +00:00
Treehugger Robot
82c5dbb07b Merge "[Bluetooth apex] Use new apex name" am: f9820781d9 
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>
 2022-08-23 21:40:31 +00:00
Treehugger Robot
f9820781d9 Merge "[Bluetooth apex] Use new apex name" 2022-08-23 21:05:13 +00:00
William Escande
2bb735c4fb [Bluetooth apex] Use new apex name 
The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: I504a8727ddf73d3568616bc0f57983331dd28744
 2022-08-22 11:27:53 -07:00
haocheng.zy
3aabcb6abd Add riscv64 support 
Signed-off-by: Zhang Ye <haocheng.zy@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>

Change-Id: Ifc1c8801d885b0b4ac1bf91842830ab650780328
 2022-08-01 16:27:30 +08:00
Treehugger Robot
de4a1d6125 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 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>
 2022-06-17 22:58:34 +00:00
Xin Li
af845c3530 [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 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>
 2022-06-17 22:57:46 +00:00
Treehugger Robot
9cf12aa868 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 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>
 2022-06-17 22:32:46 +00:00
Xin Li
580e9caedd DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: 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>
 2022-06-17 22:32:00 +00:00
Treehugger Robot
2c2abe9736 Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62 am: 8f53fdaaa6 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>
 2022-06-17 22:03:17 +00:00
Xin Li
a5b4e7363f DO NOT MERGE - Skip SQ3A.220605.009 am: bc7c5b55b5 am: 181d0ef5e2 am: 94a09cf355 
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>
 2022-06-17 22:02:32 +00:00
Xin Li
d722264e24 [automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours 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>
 2022-06-17 21:34:51 +00:00
Xin Li
e579056830 [automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours am: 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>
 2022-06-17 21:33:36 +00:00