tree 825f49297082c523f9e16a17f9ec399b7e35eee5
parent e72924914ca10a344d7410d7332552e95251fe94
parent 1f830f7196b0b0171f786bc4ab56a90bcbea43f9
author Xin Li <delphij@google.com> 1650326895 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650326895 +0000

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -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: I3fcfa21a61f634331f58d03e3a11fc0ec8953192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>