OSDN Git Service

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d7...
authorEric Laurent <elaurent@google.com>
Sat, 15 Jul 2017 00:56:06 +0000 (00:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 15 Jul 2017 00:56:06 +0000 (00:56 +0000)
am: ccd8680538

Change-Id: I0af69333bcb67ef6534175ce986fc05e5a26ffa6

1  2 
services/audioflinger/Effects.cpp

Simple merge