tree 4c3f9ecf3f538cf159d5d5d5f1b66ea9db07a5c8
parent ab438ff052e79a12a55517ee9b12bd1a9b6d0b24
parent eea5d5d23ad88c26e39bb685dce9d5b65433e56a
author Eric Laurent <elaurent@google.com> 1483569001 +0000
committer android-build-merger <android-build-merger@google.com> 1483569001 +0000

DO NOT MERGE - improve audio effect framwework thread safety am: bc7f347ff5 am: 068881e79c am: 35912764e9 am: d9e0deef93  -s ours am: 7bb8e04c67 am: 851361eda0 am: 43d30448c2
am: eea5d5d23a

Change-Id: I7bcda7a7549aa1107eaff5c0b590ea47baf76e86