tree ed2dba14aa6b7c124a03467ed4b5679b14f2f648
parent 3cc9889e233afe10ae06e96c45f4219edad558f3
parent 4ee75655ab502a72fb1ccfe467d3c293efb0893e
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1599693912 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599693912 +0000

[automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -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: I92f87237ef6f4a0b9a21801e738378d550e98465