tree 7bb46b82daab0d20b12853017f65164fc822f2c9
parent 3316317005d2dff8f4842dabb3325af237839645
parent 8be99dc25a2c18ae8a3530a7c3c94dced12f8057
author Eric Laurent <elaurent@google.com> 1483570374 +0000
committer android-build-merger <android-build-merger@google.com> 1483570374 +0000

Merge "DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b  -s ours am: 21d6eafd26  -s ours am: 6c5deab4f2 am: 9685820100  -s ours am: 6608eddab9 am: c6a7a42379 am: d1b6293802 am: 1771044fd4  -s ours am: 9ddb80f888 am: 58a605ff7d am: b132ba6071 am: 482341fa20 am: 6896c4afd1" into nyc-mr2-dev-plus-aosp
am: 8be99dc25a  -s ours

Change-Id: I49c394d6bd2465c79c6795290d46019f890892e2