tree 32c59ae8474727beb681f6bb8710ec60a7d0c92b
parent e6bb1bdd21f284cb4cf2185a4cfadfae7f2e18c3
parent 1d2f93208dee90e6c4c3aab18a53d3f2116e63bd
author Eric Laurent <elaurent@google.com> 1484354848 +0000
committer android-build-merger <android-build-merger@google.com> 1484354848 +0000

Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6  -s ours
am: 1d2f93208d  -s ours

Change-Id: Ic97851e34bfb989aae8773f0475ae6a61d967950