tree 825f49297082c523f9e16a17f9ec399b7e35eee5
parent 3c9fe295418f7d52232a22425b381abe0d930987
parent cb00f5235dd7eb63096f03553260e5bff27476b6
author Xin Li <delphij@google.com> 1655409517 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655409517 +0000

[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>