tree 55a5550d56ced9d0e1f8c06b061077acd26df3e6
parent 8336b893451a47d7efb9fd1901cd17a0f60afa1d
parent 035cf671b8235cf667f94ca67266c32034eb88cd
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1599690730 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599690730 +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

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

Change-Id: I8be6b18443220d62f6f0241003080db5da857e61