tree ed2dba14aa6b7c124a03467ed4b5679b14f2f648
parent f142fe0030ad671b3651f8ade8b0691e632d1e44
parent 971b630c478d23226d2f435845a87cb9235361fe
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1599693461 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599693461 +0000

[automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours

am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

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

Change-Id: I3b6f0708a5aedd7307ee2ebec7d56eca5b169818