tree 873ec2ac2742b801a1f92e9c9770202a3284a905
parent 7397892d72ec97eaddcade24d0427468a3f89c0b
parent d5d23f6438cd77f18a93658b1bb67326d5f7c73b
author Eric Laurent <elaurent@google.com> 1435695114 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435695114 +0000

am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit 'd5d23f6438cd77f18a93658b1bb67326d5f7c73b':
  DO NOT MERGE - audio effects: fix heap overflow