tree 5d3495362261003fb53836cf541467e65b1a0b39
parent eed5e4bd2b25da3e1965f4ab360f3cea1ccbcc2c
parent 21291a420e11ccdf23e955c3dc390304230ddce3
author Eric Laurent <elaurent@google.com> 1421363075 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421363075 +0000

am 21291a42: Merge "fix leak in audio policy effect config parser" into lmp-mr1-dev

* commit '21291a420e11ccdf23e955c3dc390304230ddce3':
  fix leak in audio policy effect config parser