tree a42445d43b95ccd540af2103c43b632aa28cd0fb
parent d555cedc95bf978bed1927476b0b81d16995b2c4
parent c580437d7caf8b2efaeaeb50440815149cd788bd
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1543346010 -0800
committer android-build-merger <android-build-merger@google.com> 1543346010 -0800

Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." am: 0a1e3b6ef9
am: c580437d7c

Change-Id: Id8f177954c585644d0535a44560fa3923780a764