tree ed2dba14aa6b7c124a03467ed4b5679b14f2f648
parent 971b630c478d23226d2f435845a87cb9235361fe
parent ce38f5433995fa5f2190422d9db87c0db3178d46
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1599692401 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599692401 +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 skip reason: subject contains skip directive

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

Change-Id: Ie337579b14a76c90016c6866d58422816d61ea0a