mirror of
https://github.com/mstorsjo/fdk-aac.git
synced 2025-06-05 22:39:13 +02:00
[automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3
-s ours am: 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>
This commit is contained in: