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

[automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -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: Ic35150ce86342d8abe9bfc0f77c0b255c3ec7d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>