tree 6ca310606cc8eca244bad34907fd7759836cb772
parent c7f89b07129141774b2add9d07b52848412fdb87
parent 71bf6ae80d68c2fe543c62482453f10362aa7611
author Eric Laurent <elaurent@google.com> 1282863097 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282863097 -0700

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

Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'

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