tree d093c11d9e27128557bc82b28da6c0802421a8d8
parent 41779c4849d0edfd72c784fdbd4de92784056ee7
parent 0f2dde714c43f305e557e391f03ba7a2756fc3db
author Eric Laurent <elaurent@google.com> 1499739750 +0000
committer android-build-merger <android-build-merger@google.com> 1499739750 +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

Change-Id: I989d49750287cab0dace0485f7d0a9bd8fae5887