OSDN Git Service

DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
authorEric Laurent <elaurent@google.com>
Wed, 4 Jan 2017 22:20:47 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Jan 2017 22:20:47 +0000 (22:20 +0000)
am: 73a152960b  -s ours

Change-Id: Id10c17b4bbdc1dd90a1cad25b6c697f8b6a0bcd0


Trivial merge