mirror of https://github.com/mstorsjo/fdk-aac.git
[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 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>
This commit is contained in:
commit
85b17c8c10