tree 3f88392b4071b80ad0dd4f109dc1ac4accadf66a
parent f309c7a869b968465619077c78922cf3f95a629d
parent c6d7a8953de9dd4e0af1dca69d83d810c05d809d
author Eric Laurent <elaurent@google.com> 1282845841 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282845841 -0700

am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread

Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp

* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
  Changed type of reverb presets from int to short