commit 12b4e9b11a0ab45e2d118ba53d72d1d907871d72
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 06 17:56:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 06 17:56:32 2019 +0000
tree 0039775face857b479da9578570c9119878ebf11
parent f30859cd4b94e6f855cc85969a7a9b50a7891dad
parent ccab80f0013a7bb139f698a823c389a682ed912f

Merge changes from topic "am-e66183f9-fddc-442d-99f7-bd853e184fba" into oc-dev

* changes:
  [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e
  [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3
  [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af
  [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5
  [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870
  [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx