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

[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 am: aa6329fb90

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

Change-Id: I8235c710a39639720ca3a52f6a0c84f3cbc6fe5f