commit 8a8492147174c8b24a352787eb2d8282ef2860e8
author Eric Laurent <elaurent@google.com> Mon Feb 03 18:02:48 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 03 18:02:48 2014 +0000
tree 1c199ca2e843a6ac3701e61c3b1c995f3334454f
parent ec57560eae4d063894e56f8d41399055a6e0cd1d
parent af1aa00e5e6fa3dcd5b7d9145ac6f7659f98bb68

am af1aa00e: am c4eef29a: Merge "fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds"

* commit 'af1aa00e5e6fa3dcd5b7d9145ac6f7659f98bb68':
  fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds