tree f1548891fab33ca03923f70cf25a2ffeab50be82
parent 0319aaecb03aa83924ab4e3d9c9bc657c2e8bc06
parent 3be9523784cc4038f601e510faee595117cdacb3
author Eric Laurent <elaurent@google.com> 1280508760 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280508760 -0700

am 92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.

Merge commit '92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp

* commit '92e847ed8e455dca3b2d33d92999e3960404d9af':
  Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.