tree d25777db8eb1b54df8a4982cc902c15fd82df846
parent a3ea3450eeb34dd9bd88e51c23d455d7f260cc36
parent 0a2aaafe45444bb1947c911c92587e415bbdf82b
author Android Build Merger (Role) <android-build-merger@google.com> 1483570216 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1483570217 +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