tree b1ee70858cac67b8512f6bdbd170eb9b8c6565df
parent 7f208022668b5f77fecaeff7a655c90f41712af6
parent 4b903bf11fbfa46fc8fd00c272e5c24c7e322189
author Android Build Merger (Role) <android-build-merger@google.com> 1481825035 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481825036 +0000

Merge "DO NOT MERGE - improve audio effect framwework thread safety am: b378b73dd7 am: 993c09b27b am: 98810b1a06" into nyc-mr2-dev-plus-aosp