tree d750e00d6268197aa6f3438f87f5968bab86884b
parent be89013ef6658c7a3ff7e52540c2f94ddd27410c
parent dc8528f6c625d9749163ffd41b0f8d630dc6aae0
author Jean-Michel Trivi <jmtrivi@google.com> 1559839634 -0700
committer android-build-merger <android-build-merger@google.com> 1559839634 -0700

Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev
am: dc8528f6c6

Change-Id: Idc98f9f5d735153e5ab732ffd7275a8ab5ee9599