tree 74501ada647654d29633b3acddd539fec2a59bd3
parent 61b5f49362a1714c04160da41d57f9b0560a8ff0
parent 196f1ce4841e220e4785b853f284a451ce22dc7c
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> 1546093003 -0800
committer android-build-merger <android-build-merger@google.com> 1546093003 -0800

Merge "Prevent energy overflow in acelp calc_period_factor()" am: eb9319afb2
am: 196f1ce484

Change-Id: I4bcc2e7ff145bffb7f11a090e8a048e9c2d11d76