tree 825f49297082c523f9e16a17f9ec399b7e35eee5
parent ab1e0835bac3cdc73bfa10ed7e5bda410a00b1e5
parent 7e1fb037c7c6b4f65261a981536fa1cc6b6a3879
author Xin Li <delphij@google.com> 1650432798 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650432798 +0000

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