mirror of
https://github.com/mstorsjo/fdk-aac.git
synced 2025-06-05 22:39:13 +02:00
[automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d
-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: I7881f686f3011850e299efde8c2588f5d7ceaff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: