tree 781c212fba276b74a8e3ddd17a492b4b17fecb54
parent f5c35c84fa629b8cda25f1861d91ec89d7a10f90
parent e14923b0c80b2e73e69b7917c1f170b356592d29
author Andreas Huber <andih@google.com> 1281409225 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281409225 -0700

am e14923b0: 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 'e14923b0c80b2e73e69b7917c1f170b356592d29'

* commit 'e14923b0c80b2e73e69b7917c1f170b356592d29':
  Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.