tree d25777db8eb1b54df8a4982cc902c15fd82df846
parent 10b777691375abe22cb5fab11f36fde3fdc8cf5f
parent 6fee640115e6eda5c92b77f3be5baf7460558094
author Android Build Merger (Role) <android-build-merger@google.com> 1483569161 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1483569161 +0000

Merge "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 am: f4aaaf6ca7" into nyc-mr2-dev-plus-aosp