Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f...

author Eric Laurent <elaurent@google.com>

Mon, 10 Jul 2017 20:38:06 +0000 (20:38 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 10 Jul 2017 20:38:06 +0000 (20:38 +0000)
author Eric Laurent <elaurent@google.com>
Mon, 10 Jul 2017 20:38:06 +0000 (20:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 10 Jul 2017 20:38:06 +0000 (20:38 +0000)
diff --cc services/audioflinger/Effects.cpp
Simple merge
author	Eric Laurent <elaurent@google.com>
	Mon, 10 Jul 2017 20:38:06 +0000 (20:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 10 Jul 2017 20:38:06 +0000 (20:38 +0000)