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:22:59 +0000 (22:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Jan 2017 22:22:59 +0000 (22:22 +0000)
am: 21d6eafd26  -s ours

Change-Id: I8ad30b3c76e746ed85dde65a841ebb17af519ce6


Trivial merge