OSDN Git Service

Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into...
authorEric Laurent <elaurent@google.com>
Sat, 14 Jan 2017 00:47:28 +0000 (00:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 14 Jan 2017 00:47:28 +0000 (00:47 +0000)
am: 1d2f93208d  -s ours

Change-Id: Ic97851e34bfb989aae8773f0475ae6a61d967950


Trivial merge