diff options
| author | Andreas Huber <andih@google.com> | 2010-08-09 19:53:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-09 19:53:01 -0700 |
| commit | fdf9769ab08af1b4843d1566dda9a59466dff302 (patch) | |
| tree | 509b165a9c92abd77498666313483d9216648e5b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 02083117c1c8cbe239c98a90047258430da04042 (diff) | |
| parent | daae89bc67e018450281144681d65a63fb068c4c (diff) | |
am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
Merge commit '4edf85abc919b7d0e8db71c0c6166c7994269830' into gingerbread-plus-aosp
* commit '4edf85abc919b7d0e8db71c0c6166c7994269830':
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions