tree ccec59dbd2af8aee25080155b36d8f734f34c656
parent 08430a86631981dc31350b71d0fa88f146faa572
author Filipe Gonçalves <filipe@kwamecorp.com> 1464698829 +0100
committer Filipe Gonçalves <filipe@kwamecorp.com> 1464698829 +0100

FP2-1995: MusicFX: Integrate latest AOSP fixes and improvements

Merge branch 'marshmallow-mr2-release' into HEAD

Change-Id: Ib1d54fad1a5284c9b455201988c705efd15a1194