tree 39c858f8e973cc965ce0ef6d53216aace55e1eef
parent 35d622f2422412dab726d7c795d0fd593683ac64
parent e212d03d510a32a2c9dd4b79604c88e7291911bc
author Eric Laurent <elaurent@google.com> 1499740083 +0000
committer android-build-merger <android-build-merger@google.com> 1499740083 +0000

Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f am: dc2efe3808 am: 4324bdc8f7 am: acbb8e7dd1 am: c6358fa910 am: 62948f53a2 am: a9565fba8b am: be01ebd598 am: 46da92fa8f am: b1a72c8787 am: db02180546  -s ours am: 880adb1f2e am: 56007baa97 am: 18162a5a35 am: e8fa1a74ee am: 0f2dde714c am: 625b66030b
am: e212d03d51

Change-Id: Ia3ee2a554294acb281d0f89a7a23b35821183acd