tree 825f49297082c523f9e16a17f9ec399b7e35eee5
parent 7561fa0250d6e89c9ed57b79031546f5818a1b72
parent 456ba9e186c92e8927edff7e46b04d9d358d2380
author Xin Li <delphij@google.com> 1650430051 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650430051 +0000

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours

am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/17805627

Change-Id: I5681a91da0fd07d4d7d63c2121b614f209aefada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>