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.
tree: e980b5fbddab8ea9689e82daf0c390268c65988b
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/